diff options
Diffstat (limited to 'poky/meta/recipes-devtools/binutils')
46 files changed, 2472 insertions, 5623 deletions
diff --git a/poky/meta/recipes-devtools/binutils/binutils-2.30.inc b/poky/meta/recipes-devtools/binutils/binutils-2.31.inc index 35d7d9b93..0c9d4cef2 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-2.30.inc +++ b/poky/meta/recipes-devtools/binutils/binutils-2.31.inc @@ -18,7 +18,7 @@ BINUPV = "${@binutils_branch_version(d)}" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" -SRCREV ?= "caa839fba66600a6c36d3639906ed9110b79c307" +SRCREV ?= "4568e49ff799192fea4f66063fe13e2b871ec75a" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ @@ -35,19 +35,18 @@ SRC_URI = "\ file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ file://0014-Detect-64-bit-MIPS-targets.patch \ file://0015-sync-with-OE-libtool-changes.patch \ - file://CVE-2018-8945.patch \ - file://CVE-2018-7643.patch \ - file://CVE-2018-6872.patch \ - file://CVE-2018-6759.patch \ - file://CVE-2018-7642.patch \ - file://CVE-2018-7208.patch \ - file://CVE-2018-7569.patch \ - file://CVE-2018-7568.patch \ - file://CVE-2018-10373.patch \ - file://CVE-2018-10372.patch \ - file://CVE-2018-10535.patch \ - file://CVE-2018-10534.patch \ - file://0001-Change-the-ARM-assembler-s-ADR-and-ADRl-pseudo-ops-s.patch \ + file://0016-add-i386pep-emulation-for-x86_64.patch \ + file://0017-improve-check-for-input-file-matching-output-file.patch \ + file://0018-Refactored-location-where-GOT-information-is-collect.patch \ + file://0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch \ + file://0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch \ + file://0021-PLT-information-was-still-being-generated-when-symbo.patch \ + file://CVE-2018-17358.patch \ + file://CVE-2018-17360.patch \ + file://CVE-2018-18309.patch \ + file://CVE-2018-18605.patch \ + file://CVE-2018-18606.patch \ + file://CVE-2018-18607.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb index 5dbaa0301..5dbaa0301 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross_2.30.bb b/poky/meta/recipes-devtools/binutils/binutils-cross_2.31.bb index fbd1f7d25..fbd1f7d25 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross_2.30.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross_2.31.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb index 37f4d6d2e..37f4d6d2e 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils.inc b/poky/meta/recipes-devtools/binutils/binutils.inc index 37813dd86..0fb6cae40 100644 --- a/poky/meta/recipes-devtools/binutils/binutils.inc +++ b/poky/meta/recipes-devtools/binutils/binutils.inc @@ -38,6 +38,9 @@ FILES_${PN}-dev = " \ # Rather than duplicating multiple entries for these, make one # list and reuse it. +LDGOLD_ALTS ?= "ld.gold dwp" +LDGOLD_ALTS_riscv64 = "" + USE_ALTERNATIVES_FOR = " \ addr2line \ ar \ @@ -47,7 +50,7 @@ USE_ALTERNATIVES_FOR = " \ gprof \ ld \ ld.bfd \ - ld.gold dwp \ + ${LDGOLD_ALTS} \ nm \ objcopy \ objdump \ @@ -128,12 +131,12 @@ do_install () { # We don't really need these, so we'll remove them... rm -rf ${D}${libdir}/ldscripts + bindir_rel=${@os.path.relpath('${bindir}', '${prefix}/${TARGET_SYS}/bin')} + # Fix the /usr/${TARGET_SYS}/bin/* links for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do rm -f $l - ln -sf `echo ${prefix}/${TARGET_SYS}/bin \ - | tr -s / \ - | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l + ln -sf $bindir_rel/${TARGET_PREFIX}`basename $l` $l done # Install the libiberty header diff --git a/poky/meta/recipes-devtools/binutils/binutils/0001-Change-the-ARM-assembler-s-ADR-and-ADRl-pseudo-ops-s.patch b/poky/meta/recipes-devtools/binutils/binutils/0001-Change-the-ARM-assembler-s-ADR-and-ADRl-pseudo-ops-s.patch deleted file mode 100644 index 8604e678d..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/0001-Change-the-ARM-assembler-s-ADR-and-ADRl-pseudo-ops-s.patch +++ /dev/null @@ -1,176 +0,0 @@ -From fc6141f097056f830a412afebed8d81a9d72b696 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Wed, 20 Jun 2018 12:38:10 +0100 -Subject: [PATCH] Change the ARM assembler's ADR and ADRl pseudo-ops so that - they will only set the bottom bit of imported thumb function symbols if the - -mthumb-interwork option is active. - -For more information see the email thread starting here: -https://www.sourceware.org/ml/binutils/2018-05/msg00348.html - - PR 21458 - * tc-arm.c (do_adr): Only set the bottom bit of an imported thumb - function symbol address if -mthumb-interwork is active. - (do_adrl): Likewise. - * doc/c-arm.texi: Update descriptions of the -mthumb-interwork - option and the ADR and ADRL pseudo-ops. - * NEWS: Mention the new behaviour of the ADR and ADRL pseudo-ops. - * testsuite/gas/arm/pr21458.d: Add -mthumb-interwork option to - assembler command line. - * testsuite/gas/arm/adr.d: Likewise. - * testsuite/gas/arm/adrl.d: Likewise. ---- - gas/ChangeLog | 14 ++++++++++++++ - gas/NEWS | 4 ++++ - gas/config/tc-arm.c | 10 ++++++---- - gas/doc/c-arm.texi | 17 ++++++++++++++++- - gas/testsuite/gas/arm/adr.d | 1 + - gas/testsuite/gas/arm/adrl.d | 1 + - gas/testsuite/gas/arm/pr21458.d | 3 ++- - 7 files changed, 44 insertions(+), 6 deletions(-) - -Index: git/gas/config/tc-arm.c -=================================================================== ---- git.orig/gas/config/tc-arm.c -+++ git/gas/config/tc-arm.c -@@ -8410,11 +8410,12 @@ do_adr (void) - inst.reloc.pc_rel = 1; - inst.reloc.exp.X_add_number -= 8; - -- if (inst.reloc.exp.X_op == O_symbol -+ if (support_interwork -+ && inst.reloc.exp.X_op == O_symbol - && inst.reloc.exp.X_add_symbol != NULL - && S_IS_DEFINED (inst.reloc.exp.X_add_symbol) - && THUMB_IS_FUNC (inst.reloc.exp.X_add_symbol)) -- inst.reloc.exp.X_add_number += 1; -+ inst.reloc.exp.X_add_number |= 1; - } - - /* This is a pseudo-op of the form "adrl rd, label" to be converted -@@ -8434,11 +8435,12 @@ do_adrl (void) - inst.size = INSN_SIZE * 2; - inst.reloc.exp.X_add_number -= 8; - -- if (inst.reloc.exp.X_op == O_symbol -+ if (support_interwork -+ && inst.reloc.exp.X_op == O_symbol - && inst.reloc.exp.X_add_symbol != NULL - && S_IS_DEFINED (inst.reloc.exp.X_add_symbol) - && THUMB_IS_FUNC (inst.reloc.exp.X_add_symbol)) -- inst.reloc.exp.X_add_number += 1; -+ inst.reloc.exp.X_add_number |= 1; - } - - static void -Index: git/gas/doc/c-arm.texi -=================================================================== ---- git.orig/gas/doc/c-arm.texi -+++ git/gas/doc/c-arm.texi -@@ -317,7 +317,8 @@ instructions; that is, it should behave - @cindex @code{-mthumb-interwork} command line option, ARM - @item -mthumb-interwork - This option specifies that the output generated by the assembler should --be marked as supporting interworking. -+be marked as supporting interworking. It also affects the behaviour -+of the @code{ADR} and @code{ADRL} pseudo opcodes. - - @cindex @code{-mimplicit-it} command line option, ARM - @item -mimplicit-it=never -@@ -1060,6 +1061,16 @@ out of range, or if it is not defined in - the ADR instruction, then an error will be generated. This instruction - will not make use of the literal pool. - -+If @var{label} is a thumb function symbol, and thumb interworking has -+been enabled via the @option{-mthumb-interwork} option then the bottom -+bit of the value stored into @var{register} will be set. This allows -+the following sequence to work as expected: -+ -+@smallexample -+ adr r0, thumb_function -+ blx r0 -+@end smallexample -+ - @cindex @code{ADRL reg,<label>} pseudo op, ARM - @item ADRL - @smallexample -@@ -1076,6 +1087,10 @@ If the label is out of range, or if it i - (and section) as the ADRL instruction, then an error will be generated. - This instruction will not make use of the literal pool. - -+If @var{label} is a thumb function symbol, and thumb interworking has -+been enabled via the @option{-mthumb-interwork} option then the bottom -+bit of the value stored into @var{register} will be set. -+ - @end table - - For information on the ARM or Thumb instruction sets, see @cite{ARM -Index: git/gas/testsuite/gas/arm/adr.d -=================================================================== ---- git.orig/gas/testsuite/gas/arm/adr.d -+++ git/gas/testsuite/gas/arm/adr.d -@@ -1,3 +1,4 @@ -+#as: -mthumb-interwork - #objdump: -dr --prefix-addresses --show-raw-insn - #name: ADR - -Index: git/gas/testsuite/gas/arm/adrl.d -=================================================================== ---- git.orig/gas/testsuite/gas/arm/adrl.d -+++ git/gas/testsuite/gas/arm/adrl.d -@@ -1,3 +1,4 @@ -+#as: -mthumb-interwork - #objdump: -dr --prefix-addresses --show-raw-insn - #name: ADRL - -Index: git/gas/ChangeLog -=================================================================== ---- git.orig/gas/ChangeLog -+++ git/gas/ChangeLog -@@ -1,3 +1,17 @@ -+2018-06-20 Nick Clifton <nickc@redhat.com> -+ -+ PR 21458 -+ * tc-arm.c (do_adr): Only set the bottom bit of an imported thumb -+ function symbol address if -mthumb-interwork is active. -+ (do_adrl): Likewise. -+ * doc/c-arm.texi: Update descriptions of the -mthumb-interwork -+ option and the ADR and ADRL pseudo-ops. -+ * NEWS: Mention the new behaviour of the ADR and ADRL pseudo-ops. -+ * testsuite/gas/arm/pr21458.d: Add -mthumb-interwork option to -+ assembler command line. -+ * testsuite/gas/arm/adr.d: Likewise. -+ * testsuite/gas/arm/adrl.d: Likewise. -+ - 2018-02-05 Nick Clifton <nickc@redhat.com> - - * po/ru.po: Updated Russian translation. -Index: git/gas/NEWS -=================================================================== ---- git.orig/gas/NEWS -+++ git/gas/NEWS -@@ -1,5 +1,9 @@ - -*- text -*- - -+* The ADR and ADRL pseudo-instructions supported by the ARM assembler -+ now only set the bottom bit of the address of thumb function symbols -+ if the -mthumb-interwork command line option is active. -+ - Changes in 2.30: - - * Add support for loaction views in DWARF debug line information. -Index: git/gas/testsuite/gas/arm/pr21458.d -=================================================================== ---- git.orig/gas/testsuite/gas/arm/pr21458.d -+++ git/gas/testsuite/gas/arm/pr21458.d -@@ -1,8 +1,9 @@ -+#as: -mthumb-interwork - #objdump: -d --prefix-addresses --show-raw-insn - #name: ADR(L) for Thumb functions - #skip: *-*-pe *-wince-* *-*-coff *-*-vxworks - --# Test that using ADR(L) on thumb function symbols sets the T bit. -+# Test that using ADR(L) on thumb function symbols sets the T bit when -mthumb-interwork is active. - - .*: +file format .*arm.* - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 2df836057..6bdb407b1 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,4 +1,4 @@ -From 2e1b5e24a6759de7f73aa6060a574848d9131b5a Mon Sep 17 00:00:00 2001 +From 4a99f058030c86794bb96b582a7dbd631f963b06 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/15] binutils-crosssdk: Generate relocatable SDKs @@ -18,10 +18,10 @@ 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 8732422b3a..1f257e99ca 100755 +index 370b22269d..a5c367aa8f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -279,6 +279,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" @@ -29,7 +29,7 @@ index 8732422b3a..1f257e99ca 100755 ( echo "/* Script for ld -r: link without relocation */" . ${CUSTOMIZER_SCRIPT} . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -285,10 +286,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -287,10 +288,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " @@ -43,7 +43,7 @@ index 8732422b3a..1f257e99ca 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index 9787ab5dac..0c8a93c2c8 100644 +index 444aef2942..afa99f736d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -139,8 +139,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then @@ -58,5 +58,5 @@ index 9787ab5dac..0c8a93c2c8 100644 if test -z "$PLT"; then IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index bac7fb2d1..020821383 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From 58ddf38fa53abb48b69dd76e398c73451ad1a5eb Mon Sep 17 00:00:00 2001 +From 6e78b1c88c040a742b7af82542ac7eb92eddda3d 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 @@ -19,14 +19,14 @@ RP 2017/01/30 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - ld/genscripts.sh | 23 ----------------------- - 1 file changed, 23 deletions(-) + ld/genscripts.sh | 25 ------------------------- + 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index 1f257e99ca..1583b73a2b 100755 +index a5c367aa8f..6cc9eed976 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -189,29 +189,6 @@ append_to_lib_path() +@@ -189,31 +189,6 @@ append_to_lib_path() fi } @@ -44,10 +44,12 @@ index 1f257e99ca..1583b73a2b 100755 - # 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 +- for libpath_suffix in ${LIBPATH_SUFFIX}; do +- case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in +- :* | *::* | *:*:*${libpath_suffix}) ;; +- *) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;; +- esac +- done - libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}" - fi - append_to_lib_path ${libs} @@ -57,5 +59,5 @@ index 1f257e99ca..1583b73a2b 100755 libs=${NATIVE_LIB_DIRS} if [ "x${NATIVE}" = "xyes" ] ; then -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/poky/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch index 306afe701..15193c10a 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch @@ -1,4 +1,4 @@ -From 5089be88f670bcadf7db0e778894f900b2c05d7b Mon Sep 17 00:00:00 2001 +From 4c6fd8f5eb9bc7c0d02f1a98ad86e395d4d2ab3b 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] configure: widen the regexp for SH architectures @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 2d615a9996..c4ad45c06c 100755 +index 08dd35c3ea..815e74ddb7 100755 --- a/configure +++ b/configure -@@ -3835,7 +3835,7 @@ case "${target}" in +@@ -3855,7 +3855,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -27,10 +27,10 @@ index 2d615a9996..c4ad45c06c 100755 sh*-*-elf) ;; diff --git a/gprof/configure b/gprof/configure -index 1e25102976..6b43bf2b18 100755 +index 447cea7884..a730e20509 100755 --- a/gprof/configure +++ b/gprof/configure -@@ -5874,6 +5874,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) +@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -43,5 +43,5 @@ index 1e25102976..6b43bf2b18 100755 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.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch index 3e29c5815..bf1c1be27 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From a0e893ea094c48fa803046ffa89e31907aee0597 Mon Sep 17 00:00:00 2001 +From 48ad5292b10408d4e5d5739022753a7183a1cbb3 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 04/15] Point scripts location to libdir @@ -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 6243c12528..3c5d6c8202 100644 +index d86ad0940c..c95b0ef025 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -57,7 +57,7 @@ endif @@ -25,10 +25,10 @@ index 6243c12528..3c5d6c8202 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index 760c037f9d..6dea692869 100644 +index 4792b2b013..789df2d01b 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -563,7 +563,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 760c037f9d..6dea692869 100644 BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/poky/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 2f4996937..1f589718e 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 518abb195d0eb47d8eef581d7fd0a5fd9fa73f7d Mon Sep 17 00:00:00 2001 +From 79e53510b1f9e16a21db312698fb1c1c442481e7 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 05/15] Only generate an RPATH entry if LD_RUN_PATH is not @@ -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 c0925fc9b9..7d7670a89f 100644 +index 1ad9d6b6fa..6a025a45b4 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment <<EOF +@@ -1471,6 +1471,8 @@ fragment <<EOF && command_line.rpath == NULL) { path = (const char *) getenv ("LD_RUN_PATH"); @@ -27,7 +27,7 @@ index c0925fc9b9..7d7670a89f 100644 if (path && gld${EMULATION_NAME}_search_needed (path, &n, force)) break; -@@ -1750,6 +1752,8 @@ gld${EMULATION_NAME}_before_allocation (void) +@@ -1751,6 +1753,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 c0925fc9b9..7d7670a89f 100644 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch index 333e2ee17..8550df0cb 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch @@ -1,4 +1,4 @@ -From fad053cc59baa6277182b0fc90415a214060ba99 Mon Sep 17 00:00:00 2001 +From 11f6d2889725ad592ab789534ca9b858073df4d1 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/15] Use libtool 2.4 @@ -9,27 +9,27 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - bfd/configure | 1318 +++++++++++++++++------ + bfd/configure | 1322 ++++++++++++++----- bfd/configure.ac | 2 +- - binutils/configure | 1316 +++++++++++++++++------ - gas/configure | 1314 +++++++++++++++++------ - gprof/configure | 1321 +++++++++++++++++------ - ld/configure | 1691 +++++++++++++++++++++-------- - libtool.m4 | 1080 +++++++++++++------ - ltmain.sh | 2925 +++++++++++++++++++++++++++++++++----------------- + binutils/configure | 1320 ++++++++++++++----- + gas/configure | 1320 ++++++++++++++----- + gprof/configure | 1327 ++++++++++++++----- + ld/configure | 1695 ++++++++++++++++++------ + libtool.m4 | 1080 +++++++++++----- + ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- ltoptions.m4 | 2 +- ltversion.m4 | 12 +- lt~obsolete.m4 | 2 +- - opcodes/configure | 1318 +++++++++++++++++------ + opcodes/configure | 1322 ++++++++++++++----- opcodes/configure.ac | 2 +- - zlib/configure | 1316 +++++++++++++++++------ - 14 files changed, 9926 insertions(+), 3693 deletions(-) + zlib/configure | 1320 ++++++++++++++----- + 14 files changed, 9948 insertions(+), 3703 deletions(-) -diff --git a/bfd/configure b/bfd/configure -index 6c2b24ebe3..5fdd723b7f 100755 ---- a/bfd/configure -+++ b/bfd/configure -@@ -672,6 +672,9 @@ OTOOL +Index: git/bfd/configure +=================================================================== +--- git.orig/bfd/configure ++++ git/bfd/configure +@@ -704,6 +704,9 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -39,7 +39,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 OBJDUMP LN_S NM -@@ -785,6 +788,7 @@ enable_static +@@ -822,6 +825,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -47,7 +47,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1461,6 +1465,8 @@ Optional Packages: +@@ -1504,6 +1508,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] @@ -56,7 +56,7 @@ index 6c2b24ebe3..5fdd723b7f 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 -@@ -5393,8 +5399,8 @@ esac +@@ -5693,8 +5699,8 @@ esac @@ -67,7 +67,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 -@@ -5434,7 +5440,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5734,7 +5740,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. @@ -76,7 +76,7 @@ index 6c2b24ebe3..5fdd723b7f 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 -@@ -6120,8 +6126,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -87,13 +87,13 @@ index 6c2b24ebe3..5fdd723b7f 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6170,6 +6176,80 @@ esac +@@ -6470,6 +6476,80 @@ esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in @@ -140,7 +140,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. @@ -167,8 +167,8 @@ index 6c2b24ebe3..5fdd723b7f 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 : -@@ -6186,6 +6266,11 @@ case $reload_flag in + if ${lt_cv_ld_reload_flag+:} false; then : +@@ -6486,6 +6566,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -180,7 +180,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6354,7 +6439,8 @@ mingw* | pw32*) +@@ -6654,7 +6739,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -190,7 +190,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6508,6 +6594,21 @@ esac +@@ -6808,6 +6894,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; } @@ -212,7 +212,7 @@ index 6c2b24ebe3..5fdd723b7f 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 -@@ -6521,11 +6622,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli @@ -226,8 +226,6 @@ index 6c2b24ebe3..5fdd723b7f 100755 + + + - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -235,7 +233,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then @@ -247,7 +245,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -275,7 +273,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 +set dummy dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then @@ -287,7 +285,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -335,7 +333,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -378,17 +376,17 @@ index 6c2b24ebe3..5fdd723b7f 100755 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $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 : -@@ -6541,7 +6795,7 @@ do + if ${ac_cv_prog_AR+:} false; then : +@@ -6841,7 +7095,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6561,11 +6815,15 @@ $as_echo "no" >&6; } +@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } fi @@ -406,17 +404,17 @@ index 6c2b24ebe3..5fdd723b7f 100755 +set dummy $ac_prog; ac_word=$2 { $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 : -@@ -6581,7 +6839,7 @@ do + if ${ac_cv_prog_ac_ct_AR+:} false; then : +@@ -6881,7 +7139,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6600,6 +6858,10 @@ else +@@ -6900,6 +7158,10 @@ else $as_echo "no" >&6; } fi @@ -427,7 +425,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6611,16 +6873,72 @@ ac_tool_warned=yes ;; +@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -449,16 +447,16 @@ index 6c2b24ebe3..5fdd723b7f 100755 + + + -+ + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : ++if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -+ + +int +main () +{ @@ -491,11 +489,11 @@ index 6c2b24ebe3..5fdd723b7f 100755 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - ++ +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else @@ -504,7 +502,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 -@@ -6962,8 +7280,8 @@ esac +@@ -7262,8 +7580,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 @@ -515,7 +513,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6999,6 +7317,7 @@ for ac_symprfx in "" "_"; do +@@ -7299,6 +7617,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 @@ -523,7 +521,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7040,6 +7359,18 @@ _LT_EOF +@@ -7340,6 +7659,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 @@ -542,7 +540,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7051,7 +7382,7 @@ _LT_EOF +@@ -7351,7 +7682,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -551,7 +549,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 const char *name; void *address; } -@@ -7077,8 +7408,8 @@ static const void *lt_preloaded_setup() { +@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -562,7 +560,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7088,8 +7419,8 @@ _LT_EOF +@@ -7388,8 +7719,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -573,7 +571,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7126,6 +7457,16 @@ else +@@ -7426,6 +7757,20 @@ else $as_echo "ok" >&6; } fi @@ -587,20 +585,17 @@ index 6c2b24ebe3..5fdd723b7f 100755 + + + ++ ++ ++ ++ -@@ -7142,6 +7483,45 @@ fi +@@ -7445,6 +7790,41 @@ fi -+ -+ -+ -+ -+ -+ -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -627,16 +622,19 @@ index 6c2b24ebe3..5fdd723b7f 100755 + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 +$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ - -@@ -7353,6 +7733,123 @@ esac + # Check whether --enable-libtool-lock was given. +@@ -7653,6 +8033,123 @@ esac need_locks="$enable_libtool_lock" @@ -645,7 +643,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then @@ -657,7 +655,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -685,7 +683,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 +set dummy mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -697,7 +695,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -735,7 +733,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no @@ -760,7 +758,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 case $host_os in rhapsody* | darwin*) -@@ -7916,6 +8413,8 @@ _LT_EOF +@@ -8216,6 +8713,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 @@ -769,7 +767,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8080,7 +8579,8 @@ fi +@@ -8380,7 +8879,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -779,7 +777,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 -@@ -8169,7 +8669,7 @@ aix3*) +@@ -8469,7 +8969,7 @@ aix3*) esac # Global variables: @@ -788,7 +786,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8467,8 +8967,6 @@ fi +@@ -8767,8 +9267,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -797,7 +795,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8634,6 +9132,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -810,7 +808,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8696,7 +9200,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -819,7 +817,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8753,13 +9257,17 @@ case $host_os in +@@ -9053,13 +9557,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -832,7 +830,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -843,7 +841,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # # Check to make sure the PIC flag actually works. -@@ -8820,6 +9328,11 @@ fi +@@ -9120,6 +9628,11 @@ fi @@ -855,7 +853,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # # Check to make sure the static flag actually works. # -@@ -9170,7 +9683,8 @@ _LT_EOF +@@ -9470,7 +9983,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -865,7 +863,7 @@ index 6c2b24ebe3..5fdd723b7f 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' -@@ -9269,12 +9783,12 @@ _LT_EOF +@@ -9569,12 +10083,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -880,7 +878,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 fi ;; esac -@@ -9288,8 +9802,8 @@ _LT_EOF +@@ -9588,8 +10102,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -891,7 +889,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 fi ;; -@@ -9307,8 +9821,8 @@ _LT_EOF +@@ -9607,8 +10121,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -902,7 +900,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 else ld_shlibs=no fi -@@ -9354,8 +9868,8 @@ _LT_EOF +@@ -9654,8 +10168,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -913,7 +911,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 else ld_shlibs=no fi -@@ -9485,7 +9999,13 @@ _LT_EOF +@@ -9785,7 +10299,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -921,14 +919,14 @@ index 6c2b24ebe3..5fdd723b7f 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9498,22 +10018,29 @@ main () +@@ -9798,22 +10318,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -971,7 +969,7 @@ index 6c2b24ebe3..5fdd723b7f 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" -@@ -9525,7 +10052,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -979,14 +977,14 @@ index 6c2b24ebe3..5fdd723b7f 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9538,22 +10071,29 @@ main () +@@ -9838,22 +10371,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -1029,7 +1027,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9598,20 +10138,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -1107,7 +1105,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 ;; darwin* | rhapsody*) -@@ -9672,7 +10255,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -1116,7 +1114,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9680,7 +10263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp hpux9*) if test "$GCC" = yes; then @@ -1125,7 +1123,7 @@ index 6c2b24ebe3..5fdd723b7f 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 -@@ -9696,7 +10279,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -1134,7 +1132,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9720,10 +10303,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -1147,7 +1145,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 ;; esac else -@@ -9802,23 +10385,36 @@ fi +@@ -10102,23 +10685,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -1162,7 +1160,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" @@ -1192,7 +1190,7 @@ index 6c2b24ebe3..5fdd723b7f 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' -@@ -9903,7 +10499,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -1201,7 +1199,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9922,9 +10518,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -1213,7 +1211,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10500,8 +11096,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -1225,7 +1223,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10534,13 +11131,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10834,13 +11431,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 @@ -1298,7 +1296,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10632,7 +11287,7 @@ haiku*) +@@ -10932,7 +11587,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -1307,7 +1305,16 @@ index 6c2b24ebe3..5fdd723b7f 100755 hardcode_into_libs=yes ;; -@@ -11472,10 +12127,10 @@ else +@@ -11728,7 +12383,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11731 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11772,10 +12427,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)) @@ -1320,7 +1327,16 @@ index 6c2b24ebe3..5fdd723b7f 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11578,10 +12233,10 @@ else +@@ -11834,7 +12489,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11837 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11878,10 +12533,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)) @@ -1333,7 +1349,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14172,7 +14827,7 @@ SHARED_LDFLAGS= +@@ -14525,7 +15180,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 @@ -1342,7 +1358,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 fi # More hacks to build DLLs on Windows. -@@ -16879,13 +17534,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -17139,13 +17794,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ 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"`' @@ -1363,7 +1379,7 @@ index 6c2b24ebe3..5fdd723b7f 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"`' -@@ -16900,14 +17562,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -17160,14 +17822,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l 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"`' @@ -1382,7 +1398,7 @@ index 6c2b24ebe3..5fdd723b7f 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"`' -@@ -16940,12 +17605,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -17200,12 +17865,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod 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"`' @@ -1396,7 +1412,7 @@ index 6c2b24ebe3..5fdd723b7f 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"`' -@@ -17000,8 +17665,13 @@ reload_flag \ +@@ -17260,8 +17925,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1410,7 +1426,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 STRIP \ RANLIB \ CC \ -@@ -17011,12 +17681,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -17271,12 +17941,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 \ @@ -1426,7 +1442,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -17032,7 +17704,6 @@ no_undefined_flag \ +@@ -17292,7 +17964,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1434,7 +1450,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -17068,6 +17739,7 @@ module_cmds \ +@@ -17328,6 +17999,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1442,7 +1458,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -17847,7 +18519,8 @@ $as_echo X"$file" | +@@ -18116,7 +18788,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, @@ -1452,7 +1468,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17950,19 +18623,42 @@ SP2NL=$lt_lt_SP2NL +@@ -18219,19 +18892,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1496,7 +1512,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17992,6 +18688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -18261,6 +18957,12 @@ global_symbol_to_c_name_address=$lt_lt_c # 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 @@ -1509,7 +1525,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -18001,6 +18703,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -18270,6 +18972,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1519,7 +1535,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -18115,12 +18820,12 @@ with_gcc=$GCC +@@ -18384,12 +19089,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1535,7 +1551,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -18207,9 +18912,6 @@ inherit_rpath=$inherit_rpath +@@ -18476,9 +19181,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1545,7 +1561,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -18225,6 +18927,9 @@ include_expsyms=$lt_include_expsyms +@@ -18494,6 +19196,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1555,7 +1571,7 @@ index 6c2b24ebe3..5fdd723b7f 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -18257,210 +18962,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -18526,210 +19231,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? @@ -1757,15 +1773,9 @@ index 6c2b24ebe3..5fdd723b7f 100755 -_LT_EOF - ;; - esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -+ + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -1923,17 +1933,20 @@ index 6c2b24ebe3..5fdd723b7f 100755 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi -+ -+ + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -diff --git a/bfd/configure.ac b/bfd/configure.ac -index 2342f3faea..a6451fccda 100644 ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -254,7 +254,7 @@ changequote(,)dnl +Index: git/bfd/configure.ac +=================================================================== +--- git.orig/bfd/configure.ac ++++ git/bfd/configure.ac +@@ -293,7 +293,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -1942,11 +1955,11 @@ index 2342f3faea..a6451fccda 100644 fi # More hacks to build DLLs on Windows. -diff --git a/binutils/configure b/binutils/configure -index 5d9c9105a7..a65b2b4518 100755 ---- a/binutils/configure -+++ b/binutils/configure -@@ -659,8 +659,11 @@ OTOOL +Index: git/binutils/configure +=================================================================== +--- git.orig/binutils/configure ++++ git/binutils/configure +@@ -688,8 +688,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -1958,7 +1971,7 @@ index 5d9c9105a7..a65b2b4518 100755 OBJDUMP LN_S NM -@@ -772,6 +775,7 @@ enable_static +@@ -806,6 +809,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -1966,7 +1979,7 @@ index 5d9c9105a7..a65b2b4518 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1444,6 +1448,8 @@ Optional Packages: +@@ -1482,6 +1486,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] @@ -1975,7 +1988,7 @@ index 5d9c9105a7..a65b2b4518 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 -@@ -5160,8 +5166,8 @@ esac +@@ -5453,8 +5459,8 @@ esac @@ -1986,7 +1999,7 @@ index 5d9c9105a7..a65b2b4518 100755 -@@ -5201,7 +5207,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5494,7 +5500,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. @@ -1995,7 +2008,7 @@ index 5d9c9105a7..a65b2b4518 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 -@@ -5887,8 +5893,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell u # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -2006,13 +2019,13 @@ index 5d9c9105a7..a65b2b4518 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5937,6 +5943,80 @@ esac +@@ -6230,6 +6236,80 @@ esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in @@ -2059,7 +2072,7 @@ index 5d9c9105a7..a65b2b4518 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. @@ -2086,8 +2099,8 @@ index 5d9c9105a7..a65b2b4518 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 : -@@ -5953,6 +6033,11 @@ case $reload_flag in + if ${lt_cv_ld_reload_flag+:} false; then : +@@ -6246,6 +6326,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -2099,7 +2112,7 @@ index 5d9c9105a7..a65b2b4518 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6121,7 +6206,8 @@ mingw* | pw32*) +@@ -6414,7 +6499,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -2109,7 +2122,7 @@ index 5d9c9105a7..a65b2b4518 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6275,6 +6361,21 @@ esac +@@ -6568,6 +6654,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; } @@ -2131,7 +2144,7 @@ index 5d9c9105a7..a65b2b4518 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 -@@ -6290,9 +6391,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6583,9 +6684,162 @@ test -z "$deplibs_check_method" && depli @@ -2150,7 +2163,7 @@ index 5d9c9105a7..a65b2b4518 100755 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then @@ -2162,7 +2175,7 @@ index 5d9c9105a7..a65b2b4518 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -2190,7 +2203,7 @@ index 5d9c9105a7..a65b2b4518 100755 +set dummy dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then @@ -2202,7 +2215,7 @@ index 5d9c9105a7..a65b2b4518 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -2250,7 +2263,7 @@ index 5d9c9105a7..a65b2b4518 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -2295,17 +2308,17 @@ index 5d9c9105a7..a65b2b4518 100755 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $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 : -@@ -6308,7 +6562,7 @@ do + if ${ac_cv_prog_AR+:} false; then : +@@ -6601,7 +6855,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6328,11 +6582,15 @@ $as_echo "no" >&6; } +@@ -6621,11 +6875,15 @@ $as_echo "no" >&6; } fi @@ -2323,17 +2336,17 @@ index 5d9c9105a7..a65b2b4518 100755 +set dummy $ac_prog; ac_word=$2 { $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 : -@@ -6348,7 +6606,7 @@ do + if ${ac_cv_prog_ac_ct_AR+:} false; then : +@@ -6641,7 +6899,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6367,6 +6625,10 @@ else +@@ -6660,6 +6918,10 @@ else $as_echo "no" >&6; } fi @@ -2344,7 +2357,7 @@ index 5d9c9105a7..a65b2b4518 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6378,12 +6640,10 @@ ac_tool_warned=yes ;; +@@ -6671,12 +6933,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -2359,13 +2372,13 @@ index 5d9c9105a7..a65b2b4518 100755 -@@ -6395,6 +6655,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6688,6 +6948,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : ++if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no @@ -2424,7 +2437,7 @@ index 5d9c9105a7..a65b2b4518 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 -@@ -6729,8 +7047,8 @@ esac +@@ -7022,8 +7340,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 @@ -2435,7 +2448,7 @@ index 5d9c9105a7..a65b2b4518 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6766,6 +7084,7 @@ for ac_symprfx in "" "_"; do +@@ -7059,6 +7377,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 @@ -2443,7 +2456,7 @@ index 5d9c9105a7..a65b2b4518 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6807,6 +7126,18 @@ _LT_EOF +@@ -7100,6 +7419,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 @@ -2462,7 +2475,7 @@ index 5d9c9105a7..a65b2b4518 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6818,7 +7149,7 @@ _LT_EOF +@@ -7111,7 +7442,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -2471,7 +2484,7 @@ index 5d9c9105a7..a65b2b4518 100755 const char *name; void *address; } -@@ -6844,8 +7175,8 @@ static const void *lt_preloaded_setup() { +@@ -7137,8 +7468,8 @@ static const void *lt_preloaded_setup() _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -2482,7 +2495,7 @@ index 5d9c9105a7..a65b2b4518 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6855,8 +7186,8 @@ _LT_EOF +@@ -7148,8 +7479,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -2493,7 +2506,7 @@ index 5d9c9105a7..a65b2b4518 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6893,6 +7224,21 @@ else +@@ -7186,6 +7517,18 @@ else $as_echo "ok" >&6; } fi @@ -2509,18 +2522,13 @@ index 5d9c9105a7..a65b2b4518 100755 + + + -+ -+ -+ -@@ -6908,6 +7254,40 @@ fi +@@ -7207,6 +7550,43 @@ fi -+ -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -2547,16 +2555,21 @@ index 5d9c9105a7..a65b2b4518 100755 + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 +$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } - - - -@@ -7120,6 +7500,123 @@ esac ++ ++ ++ ++ ++ + # Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +@@ -7413,6 +7793,123 @@ esac need_locks="$enable_libtool_lock" @@ -2565,7 +2578,7 @@ index 5d9c9105a7..a65b2b4518 100755 +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then @@ -2577,7 +2590,7 @@ index 5d9c9105a7..a65b2b4518 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -2605,7 +2618,7 @@ index 5d9c9105a7..a65b2b4518 100755 +set dummy mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -2617,7 +2630,7 @@ index 5d9c9105a7..a65b2b4518 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -2655,7 +2668,7 @@ index 5d9c9105a7..a65b2b4518 100755 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no @@ -2680,7 +2693,7 @@ index 5d9c9105a7..a65b2b4518 100755 case $host_os in rhapsody* | darwin*) -@@ -7683,6 +8180,8 @@ _LT_EOF +@@ -7976,6 +8473,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 @@ -2689,7 +2702,7 @@ index 5d9c9105a7..a65b2b4518 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7878,7 +8377,8 @@ fi +@@ -8171,7 +8670,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -2699,7 +2712,7 @@ index 5d9c9105a7..a65b2b4518 100755 -@@ -7967,7 +8467,7 @@ aix3*) +@@ -8260,7 +8760,7 @@ aix3*) esac # Global variables: @@ -2708,7 +2721,7 @@ index 5d9c9105a7..a65b2b4518 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8265,8 +8765,6 @@ fi +@@ -8558,8 +9058,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -2717,7 +2730,7 @@ index 5d9c9105a7..a65b2b4518 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8432,6 +8930,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8725,6 +9223,12 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -2730,7 +2743,7 @@ index 5d9c9105a7..a65b2b4518 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8494,7 +8998,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8787,7 +9291,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -2739,7 +2752,7 @@ index 5d9c9105a7..a65b2b4518 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8551,13 +9055,17 @@ case $host_os in +@@ -8844,13 +9348,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -2752,7 +2765,7 @@ index 5d9c9105a7..a65b2b4518 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -2763,7 +2776,7 @@ index 5d9c9105a7..a65b2b4518 100755 # # Check to make sure the PIC flag actually works. -@@ -8618,6 +9126,11 @@ fi +@@ -8911,6 +9419,11 @@ fi @@ -2775,7 +2788,7 @@ index 5d9c9105a7..a65b2b4518 100755 # # Check to make sure the static flag actually works. # -@@ -8968,7 +9481,8 @@ _LT_EOF +@@ -9261,7 +9774,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -2785,7 +2798,7 @@ index 5d9c9105a7..a65b2b4518 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' -@@ -9067,12 +9581,12 @@ _LT_EOF +@@ -9360,12 +9874,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -2800,7 +2813,7 @@ index 5d9c9105a7..a65b2b4518 100755 fi ;; esac -@@ -9086,8 +9600,8 @@ _LT_EOF +@@ -9379,8 +9893,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -2811,7 +2824,7 @@ index 5d9c9105a7..a65b2b4518 100755 fi ;; -@@ -9105,8 +9619,8 @@ _LT_EOF +@@ -9398,8 +9912,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2822,7 +2835,7 @@ index 5d9c9105a7..a65b2b4518 100755 else ld_shlibs=no fi -@@ -9152,8 +9666,8 @@ _LT_EOF +@@ -9445,8 +9959,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2833,7 +2846,7 @@ index 5d9c9105a7..a65b2b4518 100755 else ld_shlibs=no fi -@@ -9283,7 +9797,13 @@ _LT_EOF +@@ -9576,7 +10090,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -2841,14 +2854,14 @@ index 5d9c9105a7..a65b2b4518 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9296,22 +9816,29 @@ main () +@@ -9589,22 +10109,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2891,7 +2904,7 @@ index 5d9c9105a7..a65b2b4518 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" -@@ -9323,7 +9850,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9616,7 +10143,13 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -2899,14 +2912,14 @@ index 5d9c9105a7..a65b2b4518 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9336,22 +9869,29 @@ main () +@@ -9629,22 +10162,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2949,7 +2962,7 @@ index 5d9c9105a7..a65b2b4518 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9396,20 +9936,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9689,20 +10229,63 @@ if test -z "$aix_libpath"; then aix_libp # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -3027,7 +3040,7 @@ index 5d9c9105a7..a65b2b4518 100755 ;; darwin* | rhapsody*) -@@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9763,7 +10346,7 @@ if test -z "$aix_libpath"; then aix_libp # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -3036,7 +3049,7 @@ index 5d9c9105a7..a65b2b4518 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9478,7 +10061,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9771,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libp hpux9*) if test "$GCC" = yes; then @@ -3045,7 +3058,7 @@ index 5d9c9105a7..a65b2b4518 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 -@@ -9494,7 +10077,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9787,7 +10370,7 @@ if test -z "$aix_libpath"; then aix_libp hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -3054,7 +3067,7 @@ index 5d9c9105a7..a65b2b4518 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9518,10 +10101,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9811,10 +10394,10 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -3067,7 +3080,7 @@ index 5d9c9105a7..a65b2b4518 100755 ;; esac else -@@ -9600,23 +10183,36 @@ fi +@@ -9893,23 +10476,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -3082,7 +3095,7 @@ index 5d9c9105a7..a65b2b4518 100755 + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" @@ -3112,7 +3125,7 @@ index 5d9c9105a7..a65b2b4518 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' -@@ -9701,7 +10297,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9994,7 +10590,7 @@ rm -f core conftest.err conftest.$ac_obj osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -3121,7 +3134,7 @@ index 5d9c9105a7..a65b2b4518 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9720,9 +10316,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10013,9 +10609,9 @@ rm -f core conftest.err conftest.$ac_obj no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -3133,7 +3146,7 @@ index 5d9c9105a7..a65b2b4518 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10298,8 +10894,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10591,8 +11187,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -3145,7 +3158,7 @@ index 5d9c9105a7..a65b2b4518 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10332,13 +10929,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10625,13 +11222,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 @@ -3218,7 +3231,7 @@ index 5d9c9105a7..a65b2b4518 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10430,7 +11085,7 @@ haiku*) +@@ -10723,7 +11378,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3227,7 +3240,16 @@ index 5d9c9105a7..a65b2b4518 100755 hardcode_into_libs=yes ;; -@@ -11270,10 +11925,10 @@ else +@@ -11519,7 +12174,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11522 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11563,10 +12218,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)) @@ -3240,7 +3262,16 @@ index 5d9c9105a7..a65b2b4518 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11376,10 +12031,10 @@ else +@@ -11625,7 +12280,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11628 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11669,10 +12324,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)) @@ -3253,7 +3284,7 @@ index 5d9c9105a7..a65b2b4518 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15446,13 +16101,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15731,13 +16386,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ 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"`' @@ -3274,7 +3305,7 @@ index 5d9c9105a7..a65b2b4518 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"`' -@@ -15467,14 +16129,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15752,14 +16414,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l 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"`' @@ -3293,7 +3324,7 @@ index 5d9c9105a7..a65b2b4518 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"`' -@@ -15507,12 +16172,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15792,12 +16457,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod 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"`' @@ -3307,7 +3338,7 @@ index 5d9c9105a7..a65b2b4518 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"`' -@@ -15567,8 +16232,13 @@ reload_flag \ +@@ -15852,8 +16517,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3321,7 +3352,7 @@ index 5d9c9105a7..a65b2b4518 100755 STRIP \ RANLIB \ CC \ -@@ -15578,12 +16248,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15863,12 +16533,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 \ @@ -3337,7 +3368,7 @@ index 5d9c9105a7..a65b2b4518 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15599,7 +16271,6 @@ no_undefined_flag \ +@@ -15884,7 +16556,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3345,7 +3376,7 @@ index 5d9c9105a7..a65b2b4518 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15635,6 +16306,7 @@ module_cmds \ +@@ -15920,6 +16591,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3353,7 +3384,7 @@ index 5d9c9105a7..a65b2b4518 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16392,7 +17064,8 @@ $as_echo X"$file" | +@@ -16686,7 +17358,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, @@ -3363,7 +3394,7 @@ index 5d9c9105a7..a65b2b4518 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16495,19 +17168,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16789,19 +17462,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3407,7 +3438,7 @@ index 5d9c9105a7..a65b2b4518 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16537,6 +17233,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16831,6 +17527,12 @@ global_symbol_to_c_name_address=$lt_lt_c # 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 @@ -3420,7 +3451,7 @@ index 5d9c9105a7..a65b2b4518 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16546,6 +17248,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16840,6 +17542,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3430,7 +3461,7 @@ index 5d9c9105a7..a65b2b4518 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16660,12 +17365,12 @@ with_gcc=$GCC +@@ -16954,12 +17659,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3446,7 +3477,7 @@ index 5d9c9105a7..a65b2b4518 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16752,9 +17457,6 @@ inherit_rpath=$inherit_rpath +@@ -17046,9 +17751,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3456,7 +3487,7 @@ index 5d9c9105a7..a65b2b4518 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16770,6 +17472,9 @@ include_expsyms=$lt_include_expsyms +@@ -17064,6 +17766,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3466,7 +3497,7 @@ index 5d9c9105a7..a65b2b4518 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16802,210 +17507,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17096,210 +17801,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? @@ -3668,15 +3699,9 @@ index 5d9c9105a7..a65b2b4518 100755 -_LT_EOF - ;; - esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -+ + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -3834,17 +3859,20 @@ index 5d9c9105a7..a65b2b4518 100755 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi -+ -+ + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -diff --git a/gas/configure b/gas/configure -index fbac8f44d5..a40ac2144f 100755 ---- a/gas/configure -+++ b/gas/configure -@@ -650,8 +650,11 @@ OTOOL +Index: git/gas/configure +=================================================================== +--- git.orig/gas/configure ++++ git/gas/configure +@@ -681,8 +681,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -3856,7 +3884,7 @@ index fbac8f44d5..a40ac2144f 100755 OBJDUMP LN_S NM -@@ -763,6 +766,7 @@ enable_static +@@ -799,6 +802,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -3864,7 +3892,16 @@ index fbac8f44d5..a40ac2144f 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -4921,8 +4925,8 @@ esac +@@ -1482,6 +1486,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-cpu=CPU default cpu variant is CPU (currently only supported + on ARC) + --with-system-zlib use installed libz +@@ -5269,8 +5275,8 @@ esac @@ -3875,7 +3912,7 @@ index fbac8f44d5..a40ac2144f 100755 -@@ -4962,7 +4966,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5310,7 +5316,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. @@ -3884,7 +3921,7 @@ index fbac8f44d5..a40ac2144f 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 -@@ -5648,8 +5652,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5996,8 +6002,8 @@ $as_echo_n "checking whether the shell u # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -3895,13 +3932,13 @@ index fbac8f44d5..a40ac2144f 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5698,6 +5702,80 @@ esac +@@ -6046,6 +6052,80 @@ esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in @@ -3948,7 +3985,7 @@ index fbac8f44d5..a40ac2144f 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. @@ -3975,8 +4012,8 @@ index fbac8f44d5..a40ac2144f 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 : -@@ -5714,6 +5792,11 @@ case $reload_flag in + if ${lt_cv_ld_reload_flag+:} false; then : +@@ -6062,6 +6142,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -3988,7 +4025,7 @@ index fbac8f44d5..a40ac2144f 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5882,7 +5965,8 @@ mingw* | pw32*) +@@ -6230,7 +6315,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3998,7 +4035,7 @@ index fbac8f44d5..a40ac2144f 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6036,6 +6120,21 @@ esac +@@ -6384,6 +6470,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; } @@ -4020,7 +4057,7 @@ index fbac8f44d5..a40ac2144f 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 -@@ -6051,9 +6150,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6399,9 +6500,162 @@ test -z "$deplibs_check_method" && depli @@ -4034,12 +4071,14 @@ index fbac8f44d5..a40ac2144f 100755 + + + -+if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then @@ -4051,7 +4090,7 @@ index fbac8f44d5..a40ac2144f 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -4079,7 +4118,7 @@ index fbac8f44d5..a40ac2144f 100755 +set dummy dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then @@ -4091,7 +4130,7 @@ index fbac8f44d5..a40ac2144f 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -4139,7 +4178,7 @@ index fbac8f44d5..a40ac2144f 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -4175,26 +4214,24 @@ index fbac8f44d5..a40ac2144f 100755 + + + - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $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 : -@@ -6069,7 +6321,7 @@ do + if ${ac_cv_prog_AR+:} false; then : +@@ -6417,7 +6671,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6089,11 +6341,15 @@ $as_echo "no" >&6; } +@@ -6437,11 +6691,15 @@ $as_echo "no" >&6; } fi @@ -4212,17 +4249,17 @@ index fbac8f44d5..a40ac2144f 100755 +set dummy $ac_prog; ac_word=$2 { $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 : -@@ -6109,7 +6365,7 @@ do + if ${ac_cv_prog_ac_ct_AR+:} false; then : +@@ -6457,7 +6715,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6128,6 +6384,10 @@ else +@@ -6476,6 +6734,10 @@ else $as_echo "no" >&6; } fi @@ -4233,7 +4270,7 @@ index fbac8f44d5..a40ac2144f 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6139,12 +6399,10 @@ ac_tool_warned=yes ;; +@@ -6487,12 +6749,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -4248,13 +4285,13 @@ index fbac8f44d5..a40ac2144f 100755 -@@ -6156,6 +6414,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6504,6 +6764,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : ++if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no @@ -4313,7 +4350,7 @@ index fbac8f44d5..a40ac2144f 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 -@@ -6490,8 +6806,8 @@ esac +@@ -6838,8 +7156,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 @@ -4324,7 +4361,7 @@ index fbac8f44d5..a40ac2144f 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6527,6 +6843,7 @@ for ac_symprfx in "" "_"; do +@@ -6875,6 +7193,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 @@ -4332,7 +4369,7 @@ index fbac8f44d5..a40ac2144f 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6568,6 +6885,18 @@ _LT_EOF +@@ -6916,6 +7235,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 @@ -4351,7 +4388,7 @@ index fbac8f44d5..a40ac2144f 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6579,7 +6908,7 @@ _LT_EOF +@@ -6927,7 +7258,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -4360,7 +4397,7 @@ index fbac8f44d5..a40ac2144f 100755 const char *name; void *address; } -@@ -6605,8 +6934,8 @@ static const void *lt_preloaded_setup() { +@@ -6953,8 +7284,8 @@ static const void *lt_preloaded_setup() _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -4371,7 +4408,7 @@ index fbac8f44d5..a40ac2144f 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6616,8 +6945,8 @@ _LT_EOF +@@ -6964,8 +7295,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -4382,7 +4419,7 @@ index fbac8f44d5..a40ac2144f 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6654,6 +6983,21 @@ else +@@ -7002,6 +7333,19 @@ else $as_echo "ok" >&6; } fi @@ -4399,17 +4436,13 @@ index fbac8f44d5..a40ac2144f 100755 + + + -+ -+ -@@ -6669,6 +7013,40 @@ fi +@@ -7022,6 +7366,42 @@ fi -+ -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -4436,16 +4469,20 @@ index fbac8f44d5..a40ac2144f 100755 + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 +$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ ++ - - -@@ -6881,6 +7259,123 @@ esac + # Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then : +@@ -7229,6 +7609,123 @@ esac need_locks="$enable_libtool_lock" @@ -4454,7 +4491,7 @@ index fbac8f44d5..a40ac2144f 100755 +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then @@ -4466,7 +4503,7 @@ index fbac8f44d5..a40ac2144f 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -4494,7 +4531,7 @@ index fbac8f44d5..a40ac2144f 100755 +set dummy mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -4506,7 +4543,7 @@ index fbac8f44d5..a40ac2144f 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -4544,7 +4581,7 @@ index fbac8f44d5..a40ac2144f 100755 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no @@ -4569,7 +4606,7 @@ index fbac8f44d5..a40ac2144f 100755 case $host_os in rhapsody* | darwin*) -@@ -7444,6 +7939,8 @@ _LT_EOF +@@ -7792,6 +8289,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 @@ -4578,7 +4615,7 @@ index fbac8f44d5..a40ac2144f 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7639,7 +8136,8 @@ fi +@@ -7987,7 +8486,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -4588,7 +4625,7 @@ index fbac8f44d5..a40ac2144f 100755 -@@ -7728,7 +8226,7 @@ aix3*) +@@ -8076,7 +8576,7 @@ aix3*) esac # Global variables: @@ -4597,7 +4634,7 @@ index fbac8f44d5..a40ac2144f 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8026,8 +8524,6 @@ fi +@@ -8374,8 +8874,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -4606,7 +4643,7 @@ index fbac8f44d5..a40ac2144f 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8193,6 +8689,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8541,6 +9039,12 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -4619,7 +4656,7 @@ index fbac8f44d5..a40ac2144f 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8255,7 +8757,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8603,7 +9107,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -4628,7 +4665,7 @@ index fbac8f44d5..a40ac2144f 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8312,13 +8814,17 @@ case $host_os in +@@ -8660,13 +9164,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -4641,7 +4678,7 @@ index fbac8f44d5..a40ac2144f 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -4652,7 +4689,7 @@ index fbac8f44d5..a40ac2144f 100755 # # Check to make sure the PIC flag actually works. -@@ -8379,6 +8885,11 @@ fi +@@ -8727,6 +9235,11 @@ fi @@ -4664,7 +4701,7 @@ index fbac8f44d5..a40ac2144f 100755 # # Check to make sure the static flag actually works. # -@@ -8729,7 +9240,8 @@ _LT_EOF +@@ -9077,7 +9590,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -4674,7 +4711,7 @@ index fbac8f44d5..a40ac2144f 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' -@@ -8828,12 +9340,12 @@ _LT_EOF +@@ -9176,12 +9690,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -4689,7 +4726,7 @@ index fbac8f44d5..a40ac2144f 100755 fi ;; esac -@@ -8847,8 +9359,8 @@ _LT_EOF +@@ -9195,8 +9709,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -4700,7 +4737,7 @@ index fbac8f44d5..a40ac2144f 100755 fi ;; -@@ -8866,8 +9378,8 @@ _LT_EOF +@@ -9214,8 +9728,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4711,7 +4748,7 @@ index fbac8f44d5..a40ac2144f 100755 else ld_shlibs=no fi -@@ -8913,8 +9425,8 @@ _LT_EOF +@@ -9261,8 +9775,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4722,7 +4759,7 @@ index fbac8f44d5..a40ac2144f 100755 else ld_shlibs=no fi -@@ -9044,7 +9556,13 @@ _LT_EOF +@@ -9392,7 +9906,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -4730,14 +4767,14 @@ index fbac8f44d5..a40ac2144f 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9057,22 +9575,29 @@ main () +@@ -9405,22 +9925,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4780,7 +4817,7 @@ index fbac8f44d5..a40ac2144f 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" -@@ -9084,7 +9609,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9432,7 +9959,13 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -4788,14 +4825,14 @@ index fbac8f44d5..a40ac2144f 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9097,22 +9628,29 @@ main () +@@ -9445,22 +9978,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4838,7 +4875,7 @@ index fbac8f44d5..a40ac2144f 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9157,20 +9695,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9505,20 +10045,63 @@ if test -z "$aix_libpath"; then aix_libp # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -4916,7 +4953,7 @@ index fbac8f44d5..a40ac2144f 100755 ;; darwin* | rhapsody*) -@@ -9231,7 +9812,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9579,7 +10162,7 @@ if test -z "$aix_libpath"; then aix_libp # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -4925,7 +4962,7 @@ index fbac8f44d5..a40ac2144f 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9239,7 +9820,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp hpux9*) if test "$GCC" = yes; then @@ -4934,7 +4971,7 @@ index fbac8f44d5..a40ac2144f 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 -@@ -9255,7 +9836,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9603,7 +10186,7 @@ if test -z "$aix_libpath"; then aix_libp hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -4943,7 +4980,7 @@ index fbac8f44d5..a40ac2144f 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9279,10 +9860,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9627,10 +10210,10 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -4956,7 +4993,7 @@ index fbac8f44d5..a40ac2144f 100755 ;; esac else -@@ -9361,23 +9942,36 @@ fi +@@ -9709,23 +10292,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -4971,7 +5008,7 @@ index fbac8f44d5..a40ac2144f 100755 + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" @@ -5001,7 +5038,7 @@ index fbac8f44d5..a40ac2144f 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' -@@ -9462,7 +10056,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9810,7 +10406,7 @@ rm -f core conftest.err conftest.$ac_obj osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -5010,7 +5047,7 @@ index fbac8f44d5..a40ac2144f 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9481,9 +10075,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9829,9 +10425,9 @@ rm -f core conftest.err conftest.$ac_obj no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -5022,7 +5059,7 @@ index fbac8f44d5..a40ac2144f 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10059,8 +10653,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10407,8 +11003,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -5034,7 +5071,7 @@ index fbac8f44d5..a40ac2144f 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10093,13 +10688,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10441,13 +11038,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 @@ -5107,7 +5144,7 @@ index fbac8f44d5..a40ac2144f 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10191,7 +10844,7 @@ haiku*) +@@ -10539,7 +11194,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -5116,7 +5153,16 @@ index fbac8f44d5..a40ac2144f 100755 hardcode_into_libs=yes ;; -@@ -11031,10 +11684,10 @@ else +@@ -11335,7 +11990,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11338 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11379,10 +12034,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)) @@ -5129,7 +5175,16 @@ index fbac8f44d5..a40ac2144f 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11137,10 +11790,10 @@ else +@@ -11441,7 +12096,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11444 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11485,10 +12140,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)) @@ -5142,7 +5197,7 @@ index fbac8f44d5..a40ac2144f 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15437,13 +16090,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15803,13 +16458,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ 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"`' @@ -5163,7 +5218,7 @@ index fbac8f44d5..a40ac2144f 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"`' -@@ -15458,14 +16118,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15824,14 +16486,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l 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"`' @@ -5182,7 +5237,7 @@ index fbac8f44d5..a40ac2144f 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"`' -@@ -15498,12 +16161,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15864,12 +16529,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod 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"`' @@ -5196,7 +5251,7 @@ index fbac8f44d5..a40ac2144f 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"`' -@@ -15558,8 +16221,13 @@ reload_flag \ +@@ -15924,8 +16589,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -5210,7 +5265,7 @@ index fbac8f44d5..a40ac2144f 100755 STRIP \ RANLIB \ CC \ -@@ -15569,12 +16237,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15935,12 +16605,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 \ @@ -5226,7 +5281,7 @@ index fbac8f44d5..a40ac2144f 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15590,7 +16260,6 @@ no_undefined_flag \ +@@ -15956,7 +16628,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -5234,7 +5289,7 @@ index fbac8f44d5..a40ac2144f 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15626,6 +16295,7 @@ module_cmds \ +@@ -15992,6 +16663,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -5242,7 +5297,7 @@ index fbac8f44d5..a40ac2144f 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16390,7 +17060,8 @@ $as_echo X"$file" | +@@ -16765,7 +17437,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, @@ -5252,7 +5307,7 @@ index fbac8f44d5..a40ac2144f 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16493,19 +17164,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16868,19 +17541,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -5296,7 +5351,7 @@ index fbac8f44d5..a40ac2144f 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16535,6 +17229,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16910,6 +17606,12 @@ global_symbol_to_c_name_address=$lt_lt_c # 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 @@ -5309,7 +5364,7 @@ index fbac8f44d5..a40ac2144f 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16544,6 +17244,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16919,6 +17621,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -5319,7 +5374,7 @@ index fbac8f44d5..a40ac2144f 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16658,12 +17361,12 @@ with_gcc=$GCC +@@ -17033,12 +17738,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -5335,7 +5390,7 @@ index fbac8f44d5..a40ac2144f 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16750,9 +17453,6 @@ inherit_rpath=$inherit_rpath +@@ -17125,9 +17830,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -5345,7 +5400,7 @@ index fbac8f44d5..a40ac2144f 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16768,6 +17468,9 @@ include_expsyms=$lt_include_expsyms +@@ -17143,6 +17845,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -5355,7 +5410,7 @@ index fbac8f44d5..a40ac2144f 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16800,210 +17503,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17175,210 +17880,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? @@ -5557,15 +5612,9 @@ index fbac8f44d5..a40ac2144f 100755 -_LT_EOF - ;; - esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -+ + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -5723,17 +5772,20 @@ index fbac8f44d5..a40ac2144f 100755 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi -+ -+ + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -diff --git a/gprof/configure b/gprof/configure -index 6b43bf2b18..245ee48bc3 100755 ---- a/gprof/configure -+++ b/gprof/configure -@@ -631,8 +631,11 @@ OTOOL +Index: git/gprof/configure +=================================================================== +--- git.orig/gprof/configure ++++ git/gprof/configure +@@ -662,8 +662,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -5745,7 +5797,7 @@ index 6b43bf2b18..245ee48bc3 100755 OBJDUMP LN_S NM -@@ -744,6 +747,7 @@ enable_static +@@ -780,6 +783,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -5753,7 +5805,7 @@ index 6b43bf2b18..245ee48bc3 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1402,6 +1406,8 @@ Optional Packages: +@@ -1442,6 +1446,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] @@ -5762,7 +5814,7 @@ index 6b43bf2b18..245ee48bc3 100755 Some influential environment variables: CC C compiler command -@@ -4836,8 +4842,8 @@ esac +@@ -5124,8 +5130,8 @@ esac @@ -5773,7 +5825,7 @@ index 6b43bf2b18..245ee48bc3 100755 -@@ -4877,7 +4883,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5165,7 +5171,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. @@ -5782,7 +5834,7 @@ index 6b43bf2b18..245ee48bc3 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 -@@ -5563,8 +5569,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -5793,13 +5845,13 @@ index 6b43bf2b18..245ee48bc3 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5613,6 +5619,80 @@ esac +@@ -5901,6 +5907,80 @@ esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in @@ -5846,7 +5898,7 @@ index 6b43bf2b18..245ee48bc3 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. @@ -5873,8 +5925,8 @@ index 6b43bf2b18..245ee48bc3 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 : -@@ -5629,6 +5709,11 @@ case $reload_flag in + if ${lt_cv_ld_reload_flag+:} false; then : +@@ -5917,6 +5997,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -5886,7 +5938,7 @@ index 6b43bf2b18..245ee48bc3 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5797,7 +5882,8 @@ mingw* | pw32*) +@@ -6085,7 +6170,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5896,7 +5948,7 @@ index 6b43bf2b18..245ee48bc3 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) +@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5908,7 +5960,7 @@ index 6b43bf2b18..245ee48bc3 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)$' -@@ -5956,6 +6037,21 @@ esac +@@ -6244,6 +6325,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; } @@ -5930,7 +5982,7 @@ index 6b43bf2b18..245ee48bc3 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 -@@ -5971,9 +6067,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli @@ -5944,12 +5996,14 @@ index 6b43bf2b18..245ee48bc3 100755 + + + -+if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then @@ -5961,7 +6015,7 @@ index 6b43bf2b18..245ee48bc3 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -5989,7 +6043,7 @@ index 6b43bf2b18..245ee48bc3 100755 +set dummy dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then @@ -6001,7 +6055,7 @@ index 6b43bf2b18..245ee48bc3 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -6049,7 +6103,7 @@ index 6b43bf2b18..245ee48bc3 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -6085,26 +6139,24 @@ index 6b43bf2b18..245ee48bc3 100755 + + + - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $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 : -@@ -5989,7 +6238,7 @@ do + if ${ac_cv_prog_AR+:} false; then : +@@ -6277,7 +6526,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6009,11 +6258,15 @@ $as_echo "no" >&6; } +@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; } fi @@ -6122,17 +6174,17 @@ index 6b43bf2b18..245ee48bc3 100755 +set dummy $ac_prog; ac_word=$2 { $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 : -@@ -6029,7 +6282,7 @@ do + if ${ac_cv_prog_ac_ct_AR+:} false; then : +@@ -6317,7 +6570,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6048,6 +6301,10 @@ else +@@ -6336,6 +6589,10 @@ else $as_echo "no" >&6; } fi @@ -6143,7 +6195,7 @@ index 6b43bf2b18..245ee48bc3 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6059,12 +6316,10 @@ ac_tool_warned=yes ;; +@@ -6347,16 +6604,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -6155,16 +6207,20 @@ index 6b43bf2b18..245ee48bc3 100755 -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} - - - -@@ -6076,6 +6331,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : ++if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no @@ -6174,7 +6230,7 @@ index 6b43bf2b18..245ee48bc3 100755 +int +main () +{ -+ + + ; + return 0; +} @@ -6200,30 +6256,23 @@ index 6b43bf2b18..245ee48bc3 100755 + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6410,8 +6723,8 @@ esac + + + +@@ -6698,8 +7011,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 @@ -6234,7 +6283,7 @@ index 6b43bf2b18..245ee48bc3 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6447,6 +6760,7 @@ for ac_symprfx in "" "_"; do +@@ -6735,6 +7048,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 @@ -6242,7 +6291,7 @@ index 6b43bf2b18..245ee48bc3 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6488,6 +6802,18 @@ _LT_EOF +@@ -6776,6 +7090,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 @@ -6261,7 +6310,7 @@ index 6b43bf2b18..245ee48bc3 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6499,7 +6825,7 @@ _LT_EOF +@@ -6787,7 +7113,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -6270,7 +6319,7 @@ index 6b43bf2b18..245ee48bc3 100755 const char *name; void *address; } -@@ -6525,8 +6851,8 @@ static const void *lt_preloaded_setup() { +@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -6281,7 +6330,7 @@ index 6b43bf2b18..245ee48bc3 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6536,8 +6862,8 @@ _LT_EOF +@@ -6824,8 +7150,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -6292,7 +6341,7 @@ index 6b43bf2b18..245ee48bc3 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6574,6 +6900,18 @@ else +@@ -6862,6 +7188,17 @@ else $as_echo "ok" >&6; } fi @@ -6307,19 +6356,14 @@ index 6b43bf2b18..245ee48bc3 100755 + + + -+ -@@ -6590,6 +6928,43 @@ fi +@@ -6883,6 +7220,44 @@ fi + -+ -+ -+ -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -6346,16 +6390,21 @@ index 6b43bf2b18..245ee48bc3 100755 + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 +$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } - - - -@@ -6801,6 +7176,123 @@ esac ++ ++ ++ ++ ++ + # Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +@@ -7089,6 +7464,123 @@ esac need_locks="$enable_libtool_lock" @@ -6364,7 +6413,7 @@ index 6b43bf2b18..245ee48bc3 100755 +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then @@ -6376,7 +6425,7 @@ index 6b43bf2b18..245ee48bc3 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -6404,7 +6453,7 @@ index 6b43bf2b18..245ee48bc3 100755 +set dummy mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -6416,7 +6465,7 @@ index 6b43bf2b18..245ee48bc3 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -6454,7 +6503,7 @@ index 6b43bf2b18..245ee48bc3 100755 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no @@ -6479,7 +6528,7 @@ index 6b43bf2b18..245ee48bc3 100755 case $host_os in rhapsody* | darwin*) -@@ -7364,6 +7856,8 @@ _LT_EOF +@@ -7652,6 +8144,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 @@ -6488,7 +6537,7 @@ index 6b43bf2b18..245ee48bc3 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7559,7 +8053,8 @@ fi +@@ -7847,7 +8341,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -6498,7 +6547,7 @@ index 6b43bf2b18..245ee48bc3 100755 -@@ -7648,7 +8143,7 @@ aix3*) +@@ -7936,7 +8431,7 @@ aix3*) esac # Global variables: @@ -6507,7 +6556,7 @@ index 6b43bf2b18..245ee48bc3 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7946,8 +8441,6 @@ fi +@@ -8234,8 +8729,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -6516,7 +6565,7 @@ index 6b43bf2b18..245ee48bc3 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8113,6 +8606,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -6529,7 +6578,7 @@ index 6b43bf2b18..245ee48bc3 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8175,7 +8674,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -6538,7 +6587,7 @@ index 6b43bf2b18..245ee48bc3 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8232,13 +8731,17 @@ case $host_os in +@@ -8520,13 +9019,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -6551,7 +6600,7 @@ index 6b43bf2b18..245ee48bc3 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -6562,7 +6611,7 @@ index 6b43bf2b18..245ee48bc3 100755 # # Check to make sure the PIC flag actually works. -@@ -8299,6 +8802,11 @@ fi +@@ -8587,6 +9090,11 @@ fi @@ -6574,7 +6623,7 @@ index 6b43bf2b18..245ee48bc3 100755 # # Check to make sure the static flag actually works. # -@@ -8649,7 +9157,8 @@ _LT_EOF +@@ -8937,7 +9445,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -6584,7 +6633,7 @@ index 6b43bf2b18..245ee48bc3 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' -@@ -8748,12 +9257,12 @@ _LT_EOF +@@ -9036,12 +9545,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -6599,7 +6648,7 @@ index 6b43bf2b18..245ee48bc3 100755 fi ;; esac -@@ -8767,8 +9276,8 @@ _LT_EOF +@@ -9055,8 +9564,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -6610,7 +6659,7 @@ index 6b43bf2b18..245ee48bc3 100755 fi ;; -@@ -8786,8 +9295,8 @@ _LT_EOF +@@ -9074,8 +9583,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6621,7 +6670,7 @@ index 6b43bf2b18..245ee48bc3 100755 else ld_shlibs=no fi -@@ -8833,8 +9342,8 @@ _LT_EOF +@@ -9121,8 +9630,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6632,7 +6681,7 @@ index 6b43bf2b18..245ee48bc3 100755 else ld_shlibs=no fi -@@ -8964,7 +9473,13 @@ _LT_EOF +@@ -9252,7 +9761,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -6640,14 +6689,14 @@ index 6b43bf2b18..245ee48bc3 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -8977,22 +9492,29 @@ main () +@@ -9265,22 +9780,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6690,7 +6739,7 @@ index 6b43bf2b18..245ee48bc3 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" -@@ -9004,7 +9526,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -6698,14 +6747,14 @@ index 6b43bf2b18..245ee48bc3 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9017,22 +9545,29 @@ main () +@@ -9305,22 +9833,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6748,7 +6797,7 @@ index 6b43bf2b18..245ee48bc3 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9077,20 +9612,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -6826,7 +6875,7 @@ index 6b43bf2b18..245ee48bc3 100755 ;; darwin* | rhapsody*) -@@ -9151,7 +9729,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -6835,7 +6884,7 @@ index 6b43bf2b18..245ee48bc3 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9159,7 +9737,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp hpux9*) if test "$GCC" = yes; then @@ -6844,7 +6893,7 @@ index 6b43bf2b18..245ee48bc3 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 -@@ -9175,7 +9753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -6853,7 +6902,7 @@ index 6b43bf2b18..245ee48bc3 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9199,10 +9777,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -6866,7 +6915,7 @@ index 6b43bf2b18..245ee48bc3 100755 ;; esac else -@@ -9281,23 +9859,36 @@ fi +@@ -9569,23 +10147,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -6881,7 +6930,7 @@ index 6b43bf2b18..245ee48bc3 100755 + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" @@ -6911,7 +6960,7 @@ index 6b43bf2b18..245ee48bc3 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' -@@ -9382,7 +9973,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -6920,7 +6969,7 @@ index 6b43bf2b18..245ee48bc3 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9401,9 +9992,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -6932,7 +6981,7 @@ index 6b43bf2b18..245ee48bc3 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -9979,8 +10570,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -6944,7 +6993,7 @@ index 6b43bf2b18..245ee48bc3 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10013,13 +10605,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10301,13 +10893,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 @@ -7017,7 +7066,7 @@ index 6b43bf2b18..245ee48bc3 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10111,7 +10761,7 @@ haiku*) +@@ -10399,7 +11049,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -7026,7 +7075,16 @@ index 6b43bf2b18..245ee48bc3 100755 hardcode_into_libs=yes ;; -@@ -10951,10 +11601,10 @@ else +@@ -11195,7 +11845,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11193 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11239,10 +11889,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)) @@ -7039,7 +7097,16 @@ index 6b43bf2b18..245ee48bc3 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11057,10 +11707,10 @@ else +@@ -11301,7 +11951,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11299 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11345,10 +11995,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)) @@ -7052,7 +7119,7 @@ index 6b43bf2b18..245ee48bc3 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13005,13 +13655,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ 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"`' @@ -7073,7 +7140,7 @@ index 6b43bf2b18..245ee48bc3 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"`' -@@ -13026,14 +13683,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l 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"`' @@ -7092,7 +7159,7 @@ index 6b43bf2b18..245ee48bc3 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"`' -@@ -13066,12 +13726,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod 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"`' @@ -7106,7 +7173,7 @@ index 6b43bf2b18..245ee48bc3 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"`' -@@ -13126,8 +13786,13 @@ reload_flag \ +@@ -13435,8 +14095,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -7120,7 +7187,7 @@ index 6b43bf2b18..245ee48bc3 100755 STRIP \ RANLIB \ CC \ -@@ -13137,12 +13802,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13446,12 +14111,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 \ @@ -7136,7 +7203,7 @@ index 6b43bf2b18..245ee48bc3 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13158,7 +13825,6 @@ no_undefined_flag \ +@@ -13467,7 +14134,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -7144,7 +7211,7 @@ index 6b43bf2b18..245ee48bc3 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13194,6 +13860,7 @@ module_cmds \ +@@ -13503,6 +14169,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -7152,7 +7219,7 @@ index 6b43bf2b18..245ee48bc3 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -13950,7 +14617,8 @@ $as_echo X"$file" | +@@ -14268,7 +14935,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, @@ -7162,7 +7229,7 @@ index 6b43bf2b18..245ee48bc3 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14053,19 +14721,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -7206,7 +7273,7 @@ index 6b43bf2b18..245ee48bc3 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14095,6 +14786,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c # 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 @@ -7219,7 +7286,7 @@ index 6b43bf2b18..245ee48bc3 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14104,6 +14801,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -7229,7 +7296,7 @@ index 6b43bf2b18..245ee48bc3 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14218,12 +14918,12 @@ with_gcc=$GCC +@@ -14536,12 +15236,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -7245,7 +7312,7 @@ index 6b43bf2b18..245ee48bc3 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14310,9 +15010,6 @@ inherit_rpath=$inherit_rpath +@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -7255,7 +7322,7 @@ index 6b43bf2b18..245ee48bc3 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14328,6 +15025,9 @@ include_expsyms=$lt_include_expsyms +@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -7265,7 +7332,7 @@ index 6b43bf2b18..245ee48bc3 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14360,210 +15060,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14678,210 +15378,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? @@ -7467,15 +7534,9 @@ index 6b43bf2b18..245ee48bc3 100755 -_LT_EOF - ;; - esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -+ + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -7633,17 +7694,20 @@ index 6b43bf2b18..245ee48bc3 100755 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi -+ -+ + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -diff --git a/ld/configure b/ld/configure -index 0cc6e8a50f..db8b998722 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -655,8 +655,11 @@ OTOOL +Index: git/ld/configure +=================================================================== +--- git.orig/ld/configure ++++ git/ld/configure +@@ -687,8 +687,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -7655,7 +7719,7 @@ index 0cc6e8a50f..db8b998722 100755 OBJDUMP LN_S NM -@@ -778,6 +781,7 @@ enable_static +@@ -815,6 +818,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -7663,7 +7727,7 @@ index 0cc6e8a50f..db8b998722 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1464,6 +1468,8 @@ Optional Packages: +@@ -1507,6 +1511,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] @@ -7672,7 +7736,7 @@ index 0cc6e8a50f..db8b998722 100755 --with-lib-path=dir1:dir2... set default LIB_PATH --with-sysroot=DIR Search for usr/lib et al within DIR. -@@ -5658,8 +5664,8 @@ esac +@@ -5959,8 +5965,8 @@ esac @@ -7683,7 +7747,7 @@ index 0cc6e8a50f..db8b998722 100755 -@@ -5699,7 +5705,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -6000,7 +6006,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. @@ -7692,7 +7756,7 @@ index 0cc6e8a50f..db8b998722 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 -@@ -6385,8 +6391,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6686,8 +6692,8 @@ $as_echo_n "checking whether the shell u # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7703,13 +7767,13 @@ index 0cc6e8a50f..db8b998722 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6435,6 +6441,80 @@ esac +@@ -6736,6 +6742,80 @@ esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in @@ -7756,7 +7820,7 @@ index 0cc6e8a50f..db8b998722 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. @@ -7783,8 +7847,8 @@ index 0cc6e8a50f..db8b998722 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 : -@@ -6451,6 +6531,11 @@ case $reload_flag in + if ${lt_cv_ld_reload_flag+:} false; then : +@@ -6752,6 +6832,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -7796,7 +7860,7 @@ index 0cc6e8a50f..db8b998722 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6619,7 +6704,8 @@ mingw* | pw32*) +@@ -6920,7 +7005,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7806,7 +7870,7 @@ index 0cc6e8a50f..db8b998722 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6773,6 +6859,21 @@ esac +@@ -7074,6 +7160,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; } @@ -7828,7 +7892,7 @@ index 0cc6e8a50f..db8b998722 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 -@@ -6788,9 +6889,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -7089,9 +7190,162 @@ test -z "$deplibs_check_method" && depli @@ -7847,7 +7911,7 @@ index 0cc6e8a50f..db8b998722 100755 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then @@ -7859,7 +7923,7 @@ index 0cc6e8a50f..db8b998722 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -7887,7 +7951,7 @@ index 0cc6e8a50f..db8b998722 100755 +set dummy dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then @@ -7899,7 +7963,7 @@ index 0cc6e8a50f..db8b998722 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -7947,7 +8011,7 @@ index 0cc6e8a50f..db8b998722 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -7992,17 +8056,17 @@ index 0cc6e8a50f..db8b998722 100755 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $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 : -@@ -6806,7 +7060,7 @@ do + if ${ac_cv_prog_AR+:} false; then : +@@ -7107,7 +7361,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6826,11 +7080,15 @@ $as_echo "no" >&6; } +@@ -7127,11 +7381,15 @@ $as_echo "no" >&6; } fi @@ -8020,17 +8084,17 @@ index 0cc6e8a50f..db8b998722 100755 +set dummy $ac_prog; ac_word=$2 { $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 : -@@ -6846,7 +7104,7 @@ do + if ${ac_cv_prog_ac_ct_AR+:} false; then : +@@ -7147,7 +7405,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6865,6 +7123,10 @@ else +@@ -7166,6 +7424,10 @@ else $as_echo "no" >&6; } fi @@ -8041,7 +8105,7 @@ index 0cc6e8a50f..db8b998722 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6876,12 +7138,12 @@ ac_tool_warned=yes ;; +@@ -7177,12 +7439,11 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8054,17 +8118,16 @@ index 0cc6e8a50f..db8b998722 100755 +: ${AR=ar} +: ${AR_FLAGS=cru} + -+ -@@ -6891,6 +7153,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -7193,6 +7454,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : ++if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no @@ -8118,10 +8181,11 @@ index 0cc6e8a50f..db8b998722 100755 + + + - ++ if test -n "$ac_tool_prefix"; then -@@ -7227,8 +7545,8 @@ esac + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +@@ -7528,8 +7846,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 @@ -8132,7 +8196,7 @@ index 0cc6e8a50f..db8b998722 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7264,6 +7582,7 @@ for ac_symprfx in "" "_"; do +@@ -7565,6 +7883,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 @@ -8140,7 +8204,7 @@ index 0cc6e8a50f..db8b998722 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7305,6 +7624,18 @@ _LT_EOF +@@ -7606,6 +7925,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 @@ -8159,7 +8223,7 @@ index 0cc6e8a50f..db8b998722 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7316,7 +7647,7 @@ _LT_EOF +@@ -7617,7 +7948,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8168,7 +8232,7 @@ index 0cc6e8a50f..db8b998722 100755 const char *name; void *address; } -@@ -7342,8 +7673,8 @@ static const void *lt_preloaded_setup() { +@@ -7643,8 +7974,8 @@ static const void *lt_preloaded_setup() _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8179,7 +8243,7 @@ index 0cc6e8a50f..db8b998722 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7353,8 +7684,8 @@ _LT_EOF +@@ -7654,8 +7985,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8190,7 +8254,7 @@ index 0cc6e8a50f..db8b998722 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7391,6 +7722,19 @@ else +@@ -7692,6 +8023,13 @@ else $as_echo "ok" >&6; } fi @@ -8201,16 +8265,10 @@ index 0cc6e8a50f..db8b998722 100755 + nm_file_list_spec='@' +fi + -+ -+ -+ -+ -+ -+ -@@ -7404,6 +7748,42 @@ fi +@@ -7713,6 +8051,48 @@ fi @@ -8218,6 +8276,7 @@ index 0cc6e8a50f..db8b998722 100755 + + + ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -8244,16 +8303,21 @@ index 0cc6e8a50f..db8b998722 100755 + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 +$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } - - - -@@ -7618,6 +7998,123 @@ esac ++ ++ ++ ++ ++ + # Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +@@ -7919,6 +8299,123 @@ esac need_locks="$enable_libtool_lock" @@ -8262,7 +8326,7 @@ index 0cc6e8a50f..db8b998722 100755 +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then @@ -8274,7 +8338,7 @@ index 0cc6e8a50f..db8b998722 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -8302,7 +8366,7 @@ index 0cc6e8a50f..db8b998722 100755 +set dummy mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -8314,7 +8378,7 @@ index 0cc6e8a50f..db8b998722 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -8352,7 +8416,7 @@ index 0cc6e8a50f..db8b998722 100755 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no @@ -8377,7 +8441,7 @@ index 0cc6e8a50f..db8b998722 100755 case $host_os in rhapsody* | darwin*) -@@ -8181,6 +8678,8 @@ _LT_EOF +@@ -8482,6 +8979,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 @@ -8386,7 +8450,7 @@ index 0cc6e8a50f..db8b998722 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8249,6 +8748,16 @@ done +@@ -8550,6 +9049,16 @@ done @@ -8403,7 +8467,7 @@ index 0cc6e8a50f..db8b998722 100755 # Set options -@@ -8377,7 +8886,8 @@ fi +@@ -8678,7 +9187,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -8413,7 +8477,7 @@ index 0cc6e8a50f..db8b998722 100755 -@@ -8466,7 +8976,7 @@ aix3*) +@@ -8767,7 +9277,7 @@ aix3*) esac # Global variables: @@ -8422,7 +8486,7 @@ index 0cc6e8a50f..db8b998722 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8764,8 +9274,6 @@ fi +@@ -9065,8 +9575,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8431,7 +8495,7 @@ index 0cc6e8a50f..db8b998722 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8931,6 +9439,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9232,6 +9740,12 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8444,7 +8508,7 @@ index 0cc6e8a50f..db8b998722 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8993,7 +9507,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -9294,7 +9808,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8453,7 +8517,7 @@ index 0cc6e8a50f..db8b998722 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9050,13 +9564,17 @@ case $host_os in +@@ -9351,13 +9865,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8466,7 +8530,7 @@ index 0cc6e8a50f..db8b998722 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -8477,7 +8541,7 @@ index 0cc6e8a50f..db8b998722 100755 # # Check to make sure the PIC flag actually works. -@@ -9117,6 +9635,11 @@ fi +@@ -9418,6 +9936,11 @@ fi @@ -8489,7 +8553,7 @@ index 0cc6e8a50f..db8b998722 100755 # # Check to make sure the static flag actually works. # -@@ -9467,7 +9990,8 @@ _LT_EOF +@@ -9768,7 +10291,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8499,7 +8563,7 @@ index 0cc6e8a50f..db8b998722 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' -@@ -9566,12 +10090,12 @@ _LT_EOF +@@ -9867,12 +10391,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8514,7 +8578,7 @@ index 0cc6e8a50f..db8b998722 100755 fi ;; esac -@@ -9585,8 +10109,8 @@ _LT_EOF +@@ -9886,8 +10410,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8525,7 +8589,7 @@ index 0cc6e8a50f..db8b998722 100755 fi ;; -@@ -9604,8 +10128,8 @@ _LT_EOF +@@ -9905,8 +10429,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8536,7 +8600,7 @@ index 0cc6e8a50f..db8b998722 100755 else ld_shlibs=no fi -@@ -9651,8 +10175,8 @@ _LT_EOF +@@ -9952,8 +10476,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8547,7 +8611,7 @@ index 0cc6e8a50f..db8b998722 100755 else ld_shlibs=no fi -@@ -9782,7 +10306,13 @@ _LT_EOF +@@ -10083,7 +10607,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8555,14 +8619,14 @@ index 0cc6e8a50f..db8b998722 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9795,22 +10325,29 @@ main () +@@ -10096,22 +10626,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8605,7 +8669,7 @@ index 0cc6e8a50f..db8b998722 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" -@@ -9822,7 +10359,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10123,7 +10660,13 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -8613,14 +8677,14 @@ index 0cc6e8a50f..db8b998722 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9835,22 +10378,29 @@ main () +@@ -10136,22 +10679,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8663,11 +8727,10 @@ index 0cc6e8a50f..db8b998722 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9894,21 +10444,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # When not using gcc, we currently assume that we are using +@@ -10196,20 +10746,63 @@ if test -z "$aix_libpath"; then aix_libp # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. + # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. @@ -8682,7 +8745,6 @@ index 0cc6e8a50f..db8b998722 100755 - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes -+ # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC @@ -8743,7 +8805,7 @@ index 0cc6e8a50f..db8b998722 100755 ;; darwin* | rhapsody*) -@@ -9969,7 +10562,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10270,7 +10863,7 @@ if test -z "$aix_libpath"; then aix_libp # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8752,7 +8814,7 @@ index 0cc6e8a50f..db8b998722 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9977,7 +10570,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10278,7 +10871,7 @@ if test -z "$aix_libpath"; then aix_libp hpux9*) if test "$GCC" = yes; then @@ -8761,7 +8823,7 @@ index 0cc6e8a50f..db8b998722 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 -@@ -9993,7 +10586,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10294,7 +10887,7 @@ if test -z "$aix_libpath"; then aix_libp hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8770,7 +8832,7 @@ index 0cc6e8a50f..db8b998722 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10017,10 +10610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10318,10 +10911,10 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8783,7 +8845,7 @@ index 0cc6e8a50f..db8b998722 100755 ;; esac else -@@ -10099,23 +10692,36 @@ fi +@@ -10400,23 +10993,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -8798,7 +8860,7 @@ index 0cc6e8a50f..db8b998722 100755 + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" @@ -8828,7 +8890,7 @@ index 0cc6e8a50f..db8b998722 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' -@@ -10200,7 +10806,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10501,7 +11107,7 @@ rm -f core conftest.err conftest.$ac_obj osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -8837,7 +8899,7 @@ index 0cc6e8a50f..db8b998722 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10219,9 +10825,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10520,9 +11126,9 @@ rm -f core conftest.err conftest.$ac_obj no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -8849,7 +8911,7 @@ index 0cc6e8a50f..db8b998722 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10797,8 +11403,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11098,8 +11704,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -8861,7 +8923,7 @@ index 0cc6e8a50f..db8b998722 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10831,13 +11438,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11132,13 +11739,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 @@ -8934,7 +8996,7 @@ index 0cc6e8a50f..db8b998722 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10929,7 +11594,7 @@ haiku*) +@@ -11230,7 +11895,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -8943,7 +9005,16 @@ index 0cc6e8a50f..db8b998722 100755 hardcode_into_libs=yes ;; -@@ -11769,10 +12434,10 @@ else +@@ -12026,7 +12691,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12029 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12070,10 +12735,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)) @@ -8956,7 +9027,16 @@ index 0cc6e8a50f..db8b998722 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11875,10 +12540,10 @@ else +@@ -12132,7 +12797,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12135 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12176,10 +12841,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)) @@ -8969,7 +9049,7 @@ index 0cc6e8a50f..db8b998722 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12270,6 +12935,7 @@ $RM -r conftest* +@@ -12571,6 +13236,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -8977,7 +9057,7 @@ index 0cc6e8a50f..db8b998722 100755 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12287,6 +12953,7 @@ $RM -r conftest* +@@ -12588,6 +13254,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -8985,7 +9065,7 @@ index 0cc6e8a50f..db8b998722 100755 compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12569,7 +13236,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -12870,7 +13537,13 @@ $as_echo_n "checking whether the $compil allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -8993,14 +9073,14 @@ index 0cc6e8a50f..db8b998722 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then : ++ if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -12582,22 +13255,29 @@ main () +@@ -12883,22 +13556,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9043,7 +9123,7 @@ index 0cc6e8a50f..db8b998722 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12610,7 +13290,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12911,7 +13591,13 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -9051,14 +9131,14 @@ index 0cc6e8a50f..db8b998722 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then : ++ if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -12623,22 +13309,29 @@ main () +@@ -12924,22 +13610,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9101,7 +9181,7 @@ index 0cc6e8a50f..db8b998722 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -12681,29 +13374,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12982,29 +13675,75 @@ if test -z "$aix_libpath"; then aix_libp ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9200,7 +9280,7 @@ index 0cc6e8a50f..db8b998722 100755 darwin* | rhapsody*) -@@ -12809,7 +13548,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13110,7 +13849,7 @@ if test -z "$aix_libpath"; then aix_libp ;; *) if test "$GXX" = yes; then @@ -9209,7 +9289,7 @@ index 0cc6e8a50f..db8b998722 100755 else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -12880,10 +13619,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13181,10 +13920,10 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9222,7 +9302,7 @@ index 0cc6e8a50f..db8b998722 100755 ;; esac fi -@@ -12924,9 +13663,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13225,9 +13964,9 @@ if test -z "$aix_libpath"; then aix_libp *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9234,7 +9314,7 @@ index 0cc6e8a50f..db8b998722 100755 fi fi link_all_deplibs_CXX=yes -@@ -12996,20 +13735,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13297,20 +14036,20 @@ if test -z "$aix_libpath"; then aix_libp prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9259,7 +9339,7 @@ index 0cc6e8a50f..db8b998722 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' -@@ -13204,7 +13943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13505,7 +14244,7 @@ if test -z "$aix_libpath"; then aix_libp 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' ;; *) @@ -9268,7 +9348,7 @@ index 0cc6e8a50f..db8b998722 100755 ;; esac -@@ -13250,7 +13989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13551,7 +14290,7 @@ if test -z "$aix_libpath"; then aix_libp solaris*) case $cc_basename in @@ -9277,7 +9357,7 @@ index 0cc6e8a50f..db8b998722 100755 # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13291,9 +14030,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13592,9 +14331,9 @@ if test -z "$aix_libpath"; then aix_libp 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 @@ -9289,7 +9369,7 @@ index 0cc6e8a50f..db8b998722 100755 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13428,6 +14167,13 @@ private: +@@ -13729,6 +14468,13 @@ private: }; _LT_EOF @@ -9303,7 +9383,7 @@ index 0cc6e8a50f..db8b998722 100755 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13441,7 +14187,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13742,7 +14488,7 @@ if { { eval echo "\"\$as_me\":${as_linen pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9312,7 +9392,7 @@ index 0cc6e8a50f..db8b998722 100755 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13450,13 +14196,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13751,13 +14497,22 @@ if { { eval echo "\"\$as_me\":${as_linen test $p = "-R"; then prev=$p continue @@ -9339,7 +9419,7 @@ index 0cc6e8a50f..db8b998722 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. -@@ -13476,8 +14231,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13777,8 +14532,10 @@ if { { eval echo "\"\$as_me\":${as_linen postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9350,7 +9430,7 @@ index 0cc6e8a50f..db8b998722 100755 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -13513,6 +14270,7 @@ else +@@ -13814,6 +14571,7 @@ else fi $RM -f confest.$objext @@ -9358,7 +9438,7 @@ index 0cc6e8a50f..db8b998722 100755 # PORTME: override above test on systems where it is broken case $host_os in -@@ -13548,7 +14306,7 @@ linux*) +@@ -13849,7 +14607,7 @@ linux*) solaris*) case $cc_basename in @@ -9367,7 +9447,7 @@ index 0cc6e8a50f..db8b998722 100755 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13613,8 +14371,6 @@ fi +@@ -13914,8 +14672,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9376,7 +9456,7 @@ index 0cc6e8a50f..db8b998722 100755 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -13719,6 +14475,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14020,6 +14776,11 @@ $as_echo_n "checking for $compiler optio ;; esac ;; @@ -9388,7 +9468,7 @@ index 0cc6e8a50f..db8b998722 100755 dgux*) case $cc_basename in ec++*) -@@ -13871,7 +14632,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -14172,7 +14933,7 @@ $as_echo_n "checking for $compiler optio ;; solaris*) case $cc_basename in @@ -9397,7 +9477,7 @@ index 0cc6e8a50f..db8b998722 100755 # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -13936,10 +14697,17 @@ case $host_os in +@@ -14237,10 +14998,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9407,7 +9487,7 @@ index 0cc6e8a50f..db8b998722 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then : ++if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX @@ -9418,7 +9498,7 @@ index 0cc6e8a50f..db8b998722 100755 # # Check to make sure the PIC flag actually works. -@@ -13997,6 +14765,8 @@ fi +@@ -14298,6 +15066,8 @@ fi @@ -9427,7 +9507,7 @@ index 0cc6e8a50f..db8b998722 100755 # # Check to make sure the static flag actually works. # -@@ -14174,6 +14944,7 @@ fi +@@ -14475,6 +15245,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' @@ -9435,7 +9515,7 @@ index 0cc6e8a50f..db8b998722 100755 case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14188,15 +14959,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -14489,15 +15260,20 @@ $as_echo_n "checking whether the $compil ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9461,7 +9541,7 @@ index 0cc6e8a50f..db8b998722 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14459,8 +15235,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14760,8 +15536,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9473,7 +9553,7 @@ index 0cc6e8a50f..db8b998722 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14492,13 +15269,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14793,13 +15570,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 @@ -9546,7 +9626,7 @@ index 0cc6e8a50f..db8b998722 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -14589,7 +15424,7 @@ haiku*) +@@ -14890,7 +15725,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9555,7 +9635,7 @@ index 0cc6e8a50f..db8b998722 100755 hardcode_into_libs=yes ;; -@@ -15048,6 +15883,7 @@ fi +@@ -15349,6 +16184,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9563,7 +9643,7 @@ index 0cc6e8a50f..db8b998722 100755 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -18083,13 +18919,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -18444,13 +19280,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ 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"`' @@ -9584,7 +9664,7 @@ index 0cc6e8a50f..db8b998722 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"`' -@@ -18104,14 +18947,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -18465,14 +19308,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l 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"`' @@ -9603,7 +9683,7 @@ index 0cc6e8a50f..db8b998722 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"`' -@@ -18144,12 +18990,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -18505,12 +19351,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod 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"`' @@ -9617,7 +9697,7 @@ index 0cc6e8a50f..db8b998722 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"`' -@@ -18188,8 +19034,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote +@@ -18549,8 +19395,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi 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"`' @@ -9627,7 +9707,7 @@ index 0cc6e8a50f..db8b998722 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"`' -@@ -18216,12 +19062,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ +@@ -18577,12 +19423,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har 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"`' @@ -9641,7 +9721,7 @@ index 0cc6e8a50f..db8b998722 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"`' -@@ -18259,8 +19105,13 @@ reload_flag \ +@@ -18620,8 +19466,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9655,7 +9735,7 @@ index 0cc6e8a50f..db8b998722 100755 STRIP \ RANLIB \ CC \ -@@ -18270,12 +19121,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -18631,12 +19482,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 \ @@ -9671,7 +9751,7 @@ index 0cc6e8a50f..db8b998722 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -18291,7 +19144,6 @@ no_undefined_flag \ +@@ -18652,7 +19505,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9679,7 +9759,7 @@ index 0cc6e8a50f..db8b998722 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -18313,8 +19165,8 @@ LD_CXX \ +@@ -18674,8 +19526,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9689,7 +9769,7 @@ index 0cc6e8a50f..db8b998722 100755 lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -18326,7 +19178,6 @@ no_undefined_flag_CXX \ +@@ -18687,7 +19539,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9697,7 +9777,7 @@ index 0cc6e8a50f..db8b998722 100755 exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -18360,6 +19211,7 @@ module_cmds \ +@@ -18721,6 +19572,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9705,7 +9785,7 @@ index 0cc6e8a50f..db8b998722 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18374,7 +19226,8 @@ archive_expsym_cmds_CXX \ +@@ -18735,7 +19587,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9715,7 +9795,7 @@ index 0cc6e8a50f..db8b998722 100755 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19167,7 +20020,8 @@ $as_echo X"$file" | +@@ -19539,7 +20392,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, @@ -9725,7 +9805,7 @@ index 0cc6e8a50f..db8b998722 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -19270,19 +20124,42 @@ SP2NL=$lt_lt_SP2NL +@@ -19642,19 +20496,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9769,7 +9849,7 @@ index 0cc6e8a50f..db8b998722 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -19312,6 +20189,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -19684,6 +20561,12 @@ global_symbol_to_c_name_address=$lt_lt_c # 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 @@ -9782,7 +9862,7 @@ index 0cc6e8a50f..db8b998722 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -19321,6 +20204,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -19693,6 +20576,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -9792,7 +9872,7 @@ index 0cc6e8a50f..db8b998722 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19435,12 +20321,12 @@ with_gcc=$GCC +@@ -19807,12 +20693,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -9808,7 +9888,7 @@ index 0cc6e8a50f..db8b998722 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -19527,9 +20413,6 @@ inherit_rpath=$inherit_rpath +@@ -19899,9 +20785,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -9818,7 +9898,7 @@ index 0cc6e8a50f..db8b998722 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -19545,6 +20428,9 @@ include_expsyms=$lt_include_expsyms +@@ -19917,6 +20800,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -9828,7 +9908,7 @@ index 0cc6e8a50f..db8b998722 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -19591,210 +20477,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -19963,210 +20849,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? @@ -10030,15 +10110,9 @@ index 0cc6e8a50f..db8b998722 100755 -_LT_EOF - ;; - esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -+ + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -10196,13 +10270,16 @@ index 0cc6e8a50f..db8b998722 100755 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi -+ -+ + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -19822,12 +20667,12 @@ with_gcc=$GCC_CXX +@@ -20194,12 +21039,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10218,7 +10295,7 @@ index 0cc6e8a50f..db8b998722 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -19914,9 +20759,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -20286,9 +21131,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10228,7 +10305,7 @@ index 0cc6e8a50f..db8b998722 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -19932,6 +20774,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -20304,6 +21146,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10238,10 +10315,10 @@ index 0cc6e8a50f..db8b998722 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX -diff --git a/libtool.m4 b/libtool.m4 -index 24d13f3440..e45fdc6998 100644 ---- a/libtool.m4 -+++ b/libtool.m4 +Index: git/libtool.m4 +=================================================================== +--- git.orig/libtool.m4 ++++ git/libtool.m4 @@ -1,7 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # @@ -10281,7 +10358,7 @@ index 24d13f3440..e45fdc6998 100644 AC_SUBST(LIBTOOL)dnl _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl @@ -10304,7 +10381,7 @@ index 24d13f3440..e45fdc6998 100644 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. @@ -10360,7 +10437,7 @@ index 24d13f3440..e45fdc6998 100644 +# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl --AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { @@ -10409,7 +10486,7 @@ index 24d13f3440..e45fdc6998 100644 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr ])# _LT_PROG_ECHO_BACKSLASH @@ -10662,7 +10739,7 @@ index 24d13f3440..e45fdc6998 100644 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], @@ -10790,7 +10867,7 @@ index 24d13f3440..e45fdc6998 100644 const char *name; void *address; } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -10824,7 +10901,7 @@ index 24d13f3440..e45fdc6998 100644 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) @@ -10909,7 +10986,7 @@ index 24d13f3440..e45fdc6998 100644 # # Check to make sure the static flag actually works. # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl @@ -11156,7 +11233,7 @@ index 24d13f3440..e45fdc6998 100644 # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE(int foo(void) {}, +- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" @@ -11231,7 +11308,7 @@ index 24d13f3440..e45fdc6998 100644 if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -11239,7 +11316,7 @@ index 24d13f3440..e45fdc6998 100644 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -11247,7 +11324,7 @@ index 24d13f3440..e45fdc6998 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -11256,7 +11333,7 @@ index 24d13f3440..e45fdc6998 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; else # Determine the default libpath from the value encoded in an # empty executable. @@ -11265,7 +11342,7 @@ index 24d13f3440..e45fdc6998 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; ;; cygwin* | mingw* | pw32* | cegcc*) @@ -11364,7 +11441,7 @@ index 24d13f3440..e45fdc6998 100644 darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; ;; *) if test "$GXX" = yes; then @@ -11373,7 +11450,7 @@ index 24d13f3440..e45fdc6998 100644 else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -11386,7 +11463,7 @@ index 24d13f3440..e45fdc6998 100644 ;; esac fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -11398,7 +11475,7 @@ index 24d13f3440..e45fdc6998 100644 fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -11423,7 +11500,7 @@ index 24d13f3440..e45fdc6998 100644 ;; *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -11432,7 +11509,7 @@ index 24d13f3440..e45fdc6998 100644 ;; esac -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; solaris*) case $cc_basename in @@ -11441,7 +11518,7 @@ index 24d13f3440..e45fdc6998 100644 # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -11453,7 +11530,7 @@ index 24d13f3440..e45fdc6998 100644 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; fi # test -n "$compiler" CC=$lt_save_CC @@ -11661,7 +11738,7 @@ index 24d13f3440..e45fdc6998 100644 ])# _LT_LANG_RC_CONFIG -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object AC_SUBST([OBJDUMP]) ]) @@ -11688,7 +11765,7 @@ index 24d13f3440..e45fdc6998 100644 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn ])# _LT_CHECK_SHELL_FEATURES @@ -11786,6 +11863,31 @@ index 24d13f3440..e45fdc6998 100644 -{ - func_len_result=${#1} -} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and @@ -11802,23 +11904,22 @@ index 24d13f3440..e45fdc6998 100644 +test 0 -eq $? || _lt_function_replace_fail=: +]) --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () -{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac -} +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- @@ -11842,45 +11943,24 @@ index 24d13f3440..e45fdc6998 100644 + esac + func_basename_result="${1##*/}"]) --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. ++ + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} ++ + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' ++ + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; @@ -11928,9 +12008,7 @@ index 24d13f3440..e45fdc6998 100644 + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - --_LT_EOF --esac ++ + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ @@ -11944,14 +12022,17 @@ index 24d13f3440..e45fdc6998 100644 + test 0 -eq $? || _lt_function_replace_fail=: +fi --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" +-_LT_EOF +-esac +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () @@ -12037,10 +12118,10 @@ index 24d13f3440..e45fdc6998 100644 +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS -diff --git a/ltmain.sh b/ltmain.sh -index 9503ec85d7..70e856e065 100644 ---- a/ltmain.sh -+++ b/ltmain.sh +Index: git/ltmain.sh +=================================================================== +--- git.orig/ltmain.sh ++++ git/ltmain.sh @@ -1,10 +1,9 @@ -# Generated from ltmain.m4sh. @@ -12470,31 +12551,7 @@ index 9503ec85d7..70e856e065 100644 +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac ++ + exit $EXIT_MISMATCH + fi +} @@ -12524,9 +12581,7 @@ index 9503ec85d7..70e856e065 100644 + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do ++ + + +# Option defaults: @@ -12542,8 +12597,34 @@ index 9503ec85d7..70e856e065 100644 +opt_verbose=: +opt_silent=false +opt_verbose=false -+ -+ + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ @@ -12787,13 +12868,13 @@ index 9503ec85d7..70e856e065 100644 - fi -} - -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - +- -## ----------- ## -## Main. ## -## ----------- ## -- ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" + -$opt_help || { - # Sanity checks first: - func_check_version_match @@ -13514,7 +13595,7 @@ index 9503ec85d7..70e856e065 100644 "") # Generic help is extracted from the usage comments # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: +@@ -1659,8 +2327,8 @@ This mode accepts the following addition -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes @@ -13525,7 +13606,7 @@ index 9503ec85d7..70e856e065 100644 -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u ;; *) @@ -13627,7 +13708,7 @@ index 9503ec85d7..70e856e065 100644 + do + if test -d "$opt"; then + func_append libdirs " $opt" - ++ + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" @@ -13647,7 +13728,7 @@ index 9503ec85d7..70e856e065 100644 + else + sysroot_cmd= + fi -+ + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do @@ -14059,7 +14140,7 @@ index 9503ec85d7..70e856e065 100644 lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; @@ -14588,7 +14669,7 @@ index 9503ec85d7..70e856e065 100644 */ EOF cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, if (stale) { free ((void *) stale); stale = 0; } \ } while (0) @@ -14615,7 +14696,7 @@ index 9503ec85d7..70e856e065 100644 void *xmalloc (size_t num); char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); @@ -14943,7 +15024,7 @@ index 9503ec85d7..70e856e065 100644 vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch } void @@ -14981,7 +15062,7 @@ index 9503ec85d7..70e856e065 100644 { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c void lt_update_exe_path (const char *name, const char *value) { @@ -14994,7 +15075,7 @@ index 9503ec85d7..70e856e065 100644 if (name && *name && value && *value) { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co void lt_update_lib_path (const char *name, const char *value) { @@ -17267,10 +17348,10 @@ index 9503ec85d7..70e856e065 100644 if test -n "$exec_cmd"; then eval exec "$exec_cmd" -diff --git a/ltoptions.m4 b/ltoptions.m4 -index 5ef12ced2a..17cfd51c0b 100644 ---- a/ltoptions.m4 -+++ b/ltoptions.m4 +Index: git/ltoptions.m4 +=================================================================== +--- git.orig/ltoptions.m4 ++++ git/ltoptions.m4 @@ -8,7 +8,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. @@ -17280,10 +17361,10 @@ index 5ef12ced2a..17cfd51c0b 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 bf87f77132..9c7b5d4118 100644 ---- a/ltversion.m4 -+++ b/ltversion.m4 +Index: git/ltversion.m4 +=================================================================== +--- git.orig/ltversion.m4 ++++ git/ltversion.m4 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. @@ -17308,10 +17389,10 @@ index bf87f77132..9c7b5d4118 100644 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) -diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 -index bf92b5e079..c573da90c5 100644 ---- a/lt~obsolete.m4 -+++ b/lt~obsolete.m4 +Index: git/lt~obsolete.m4 +=================================================================== +--- git.orig/lt~obsolete.m4 ++++ git/lt~obsolete.m4 @@ -7,7 +7,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. @@ -17321,11 +17402,11 @@ index bf92b5e079..c573da90c5 100644 # These exist entirely to fool aclocal when bootstrapping libtool. # -diff --git a/opcodes/configure b/opcodes/configure -index 4f29887098..2127d39288 100755 ---- a/opcodes/configure -+++ b/opcodes/configure -@@ -650,6 +650,9 @@ OTOOL +Index: git/opcodes/configure +=================================================================== +--- git.orig/opcodes/configure ++++ git/opcodes/configure +@@ -681,6 +681,9 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -17335,7 +17416,7 @@ index 4f29887098..2127d39288 100755 OBJDUMP LN_S NM -@@ -763,6 +766,7 @@ enable_static +@@ -799,6 +802,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -17343,7 +17424,7 @@ index 4f29887098..2127d39288 100755 enable_libtool_lock enable_targets enable_werror -@@ -1423,6 +1427,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] @@ -17352,7 +17433,7 @@ index 4f29887098..2127d39288 100755 Some influential environment variables: CC C compiler command -@@ -5115,8 +5121,8 @@ esac +@@ -5404,8 +5410,8 @@ esac @@ -17363,7 +17444,7 @@ index 4f29887098..2127d39288 100755 -@@ -5156,7 +5162,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5445,7 +5451,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. @@ -17372,7 +17453,7 @@ index 4f29887098..2127d39288 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 -@@ -5842,8 +5848,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6131,8 +6137,8 @@ $as_echo_n "checking whether the shell u # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -17383,13 +17464,13 @@ index 4f29887098..2127d39288 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5892,6 +5898,80 @@ esac +@@ -6181,6 +6187,80 @@ esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in @@ -17436,7 +17517,7 @@ index 4f29887098..2127d39288 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. @@ -17463,8 +17544,8 @@ index 4f29887098..2127d39288 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 : -@@ -5908,6 +5988,11 @@ case $reload_flag in + if ${lt_cv_ld_reload_flag+:} false; then : +@@ -6197,6 +6277,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -17476,7 +17557,7 @@ index 4f29887098..2127d39288 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6076,7 +6161,8 @@ mingw* | pw32*) +@@ -6365,7 +6450,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -17486,7 +17567,7 @@ index 4f29887098..2127d39288 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6230,6 +6316,21 @@ esac +@@ -6519,6 +6605,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; } @@ -17508,7 +17589,7 @@ index 4f29887098..2127d39288 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 -@@ -6243,11 +6344,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6534,9 +6635,162 @@ test -z "$deplibs_check_method" && depli @@ -17522,8 +17603,6 @@ index 4f29887098..2127d39288 100755 + + + - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -17531,7 +17610,7 @@ index 4f29887098..2127d39288 100755 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then @@ -17543,7 +17622,7 @@ index 4f29887098..2127d39288 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -17571,7 +17650,7 @@ index 4f29887098..2127d39288 100755 +set dummy dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then @@ -17583,7 +17662,7 @@ index 4f29887098..2127d39288 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -17631,7 +17710,7 @@ index 4f29887098..2127d39288 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -17674,17 +17753,17 @@ index 4f29887098..2127d39288 100755 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $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 : -@@ -6263,7 +6517,7 @@ do + if ${ac_cv_prog_AR+:} false; then : +@@ -6552,7 +6806,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6283,11 +6537,15 @@ $as_echo "no" >&6; } +@@ -6572,11 +6826,15 @@ $as_echo "no" >&6; } fi @@ -17702,17 +17781,17 @@ index 4f29887098..2127d39288 100755 +set dummy $ac_prog; ac_word=$2 { $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 : -@@ -6303,7 +6561,7 @@ do + if ${ac_cv_prog_ac_ct_AR+:} false; then : +@@ -6592,7 +6850,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6322,6 +6580,10 @@ else +@@ -6611,6 +6869,10 @@ else $as_echo "no" >&6; } fi @@ -17723,7 +17802,7 @@ index 4f29887098..2127d39288 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6333,16 +6595,72 @@ ac_tool_warned=yes ;; +@@ -6622,12 +6884,11 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -17736,19 +17815,16 @@ index 4f29887098..2127d39288 100755 +: ${AR=ar} +: ${AR_FLAGS=cru} + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -6638,6 +6899,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : ++if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no @@ -17758,7 +17834,7 @@ index 4f29887098..2127d39288 100755 +int +main () +{ - ++ + ; + return 0; +} @@ -17784,23 +17860,29 @@ index 4f29887098..2127d39288 100755 + fi + fi + rm -f conftest.* libconftest.a - ++ +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - ++ +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi ++ ++ ++ ++ ++ ++ - - -@@ -6684,8 +7002,8 @@ esac + 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. +@@ -6973,8 +7291,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 @@ -17811,7 +17893,7 @@ index 4f29887098..2127d39288 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6721,6 +7039,7 @@ for ac_symprfx in "" "_"; do +@@ -7010,6 +7328,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 @@ -17819,7 +17901,7 @@ index 4f29887098..2127d39288 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6762,6 +7081,18 @@ _LT_EOF +@@ -7051,6 +7370,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 @@ -17838,7 +17920,7 @@ index 4f29887098..2127d39288 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6773,7 +7104,7 @@ _LT_EOF +@@ -7062,7 +7393,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -17847,7 +17929,7 @@ index 4f29887098..2127d39288 100755 const char *name; void *address; } -@@ -6799,8 +7130,8 @@ static const void *lt_preloaded_setup() { +@@ -7088,8 +7419,8 @@ static const void *lt_preloaded_setup() _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -17858,7 +17940,7 @@ index 4f29887098..2127d39288 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6810,8 +7141,8 @@ _LT_EOF +@@ -7099,8 +7430,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -17869,7 +17951,7 @@ index 4f29887098..2127d39288 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6848,6 +7179,16 @@ else +@@ -7137,6 +7468,14 @@ else $as_echo "ok" >&6; } fi @@ -17881,12 +17963,10 @@ index 4f29887098..2127d39288 100755 +fi + + -+ -+ -@@ -6864,6 +7205,45 @@ fi +@@ -7158,6 +7497,47 @@ fi @@ -17894,9 +17974,6 @@ index 4f29887098..2127d39288 100755 + + + -+ -+ -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -17923,16 +18000,21 @@ index 4f29887098..2127d39288 100755 + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 +$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } - - - -@@ -7075,6 +7455,123 @@ esac ++ ++ ++ ++ ++ + # Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +@@ -7364,6 +7744,123 @@ esac need_locks="$enable_libtool_lock" @@ -17941,7 +18023,7 @@ index 4f29887098..2127d39288 100755 +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then @@ -17953,7 +18035,7 @@ index 4f29887098..2127d39288 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -17981,7 +18063,7 @@ index 4f29887098..2127d39288 100755 +set dummy mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -17993,7 +18075,7 @@ index 4f29887098..2127d39288 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -18031,7 +18113,7 @@ index 4f29887098..2127d39288 100755 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no @@ -18056,7 +18138,7 @@ index 4f29887098..2127d39288 100755 case $host_os in rhapsody* | darwin*) -@@ -7638,6 +8135,8 @@ _LT_EOF +@@ -7927,6 +8424,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 @@ -18065,7 +18147,7 @@ index 4f29887098..2127d39288 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7803,7 +8302,8 @@ fi +@@ -8092,7 +8591,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -18075,7 +18157,7 @@ index 4f29887098..2127d39288 100755 -@@ -7892,7 +8392,7 @@ aix3*) +@@ -8181,7 +8681,7 @@ aix3*) esac # Global variables: @@ -18084,7 +18166,7 @@ index 4f29887098..2127d39288 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8190,8 +8690,6 @@ fi +@@ -8479,8 +8979,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -18093,7 +18175,7 @@ index 4f29887098..2127d39288 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8357,6 +8855,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8646,6 +9144,12 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -18106,7 +18188,7 @@ index 4f29887098..2127d39288 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8419,7 +8923,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8708,7 +9212,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -18115,7 +18197,7 @@ index 4f29887098..2127d39288 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8476,13 +8980,17 @@ case $host_os in +@@ -8765,13 +9269,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -18128,7 +18210,7 @@ index 4f29887098..2127d39288 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -18139,7 +18221,7 @@ index 4f29887098..2127d39288 100755 # # Check to make sure the PIC flag actually works. -@@ -8543,6 +9051,11 @@ fi +@@ -8832,6 +9340,11 @@ fi @@ -18151,7 +18233,7 @@ index 4f29887098..2127d39288 100755 # # Check to make sure the static flag actually works. # -@@ -8893,7 +9406,8 @@ _LT_EOF +@@ -9182,7 +9695,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -18161,7 +18243,7 @@ index 4f29887098..2127d39288 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' -@@ -8992,12 +9506,12 @@ _LT_EOF +@@ -9281,12 +9795,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -18176,7 +18258,7 @@ index 4f29887098..2127d39288 100755 fi ;; esac -@@ -9011,8 +9525,8 @@ _LT_EOF +@@ -9300,8 +9814,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -18187,7 +18269,7 @@ index 4f29887098..2127d39288 100755 fi ;; -@@ -9030,8 +9544,8 @@ _LT_EOF +@@ -9319,8 +9833,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18198,7 +18280,7 @@ index 4f29887098..2127d39288 100755 else ld_shlibs=no fi -@@ -9077,8 +9591,8 @@ _LT_EOF +@@ -9366,8 +9880,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18209,7 +18291,7 @@ index 4f29887098..2127d39288 100755 else ld_shlibs=no fi -@@ -9208,7 +9722,13 @@ _LT_EOF +@@ -9497,7 +10011,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -18217,14 +18299,14 @@ index 4f29887098..2127d39288 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9221,22 +9741,29 @@ main () +@@ -9510,22 +10030,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18267,7 +18349,7 @@ index 4f29887098..2127d39288 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" -@@ -9248,7 +9775,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9537,7 +10064,13 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -18275,14 +18357,14 @@ index 4f29887098..2127d39288 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -9261,22 +9794,29 @@ main () +@@ -9550,22 +10083,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18325,7 +18407,7 @@ index 4f29887098..2127d39288 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9321,20 +9861,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9610,20 +10150,63 @@ if test -z "$aix_libpath"; then aix_libp # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -18403,7 +18485,7 @@ index 4f29887098..2127d39288 100755 ;; darwin* | rhapsody*) -@@ -9395,7 +9978,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9684,7 +10267,7 @@ if test -z "$aix_libpath"; then aix_libp # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -18412,7 +18494,7 @@ index 4f29887098..2127d39288 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9403,7 +9986,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9692,7 +10275,7 @@ if test -z "$aix_libpath"; then aix_libp hpux9*) if test "$GCC" = yes; then @@ -18421,7 +18503,7 @@ index 4f29887098..2127d39288 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 -@@ -9419,7 +10002,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9708,7 +10291,7 @@ if test -z "$aix_libpath"; then aix_libp hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -18430,7 +18512,7 @@ index 4f29887098..2127d39288 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9443,10 +10026,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9732,10 +10315,10 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -18443,7 +18525,7 @@ index 4f29887098..2127d39288 100755 ;; esac else -@@ -9525,23 +10108,36 @@ fi +@@ -9814,23 +10397,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -18458,7 +18540,7 @@ index 4f29887098..2127d39288 100755 + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" @@ -18488,7 +18570,7 @@ index 4f29887098..2127d39288 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' -@@ -9626,7 +10222,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9915,7 +10511,7 @@ rm -f core conftest.err conftest.$ac_obj osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -18497,7 +18579,7 @@ index 4f29887098..2127d39288 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9645,9 +10241,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9934,9 +10530,9 @@ rm -f core conftest.err conftest.$ac_obj no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -18509,7 +18591,7 @@ index 4f29887098..2127d39288 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10223,8 +10819,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10512,8 +11108,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -18521,7 +18603,7 @@ index 4f29887098..2127d39288 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10257,13 +10854,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10546,13 +11143,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 @@ -18594,7 +18676,7 @@ index 4f29887098..2127d39288 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10355,7 +11010,7 @@ haiku*) +@@ -10644,7 +11299,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -18603,7 +18685,16 @@ index 4f29887098..2127d39288 100755 hardcode_into_libs=yes ;; -@@ -11195,10 +11850,10 @@ else +@@ -11440,7 +12095,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11443 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11484,10 +12139,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)) @@ -18616,7 +18707,16 @@ index 4f29887098..2127d39288 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11301,10 +11956,10 @@ else +@@ -11546,7 +12201,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11549 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11590,10 +12245,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)) @@ -18629,7 +18729,7 @@ index 4f29887098..2127d39288 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12543,7 +13198,7 @@ if test "$enable_shared" = "yes"; then +@@ -12831,7 +13486,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 @@ -18638,7 +18738,7 @@ index 4f29887098..2127d39288 100755 fi case "${host}" in -@@ -13520,13 +14175,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13807,13 +14462,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ 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"`' @@ -18659,7 +18759,7 @@ index 4f29887098..2127d39288 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"`' -@@ -13541,14 +14203,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13828,14 +14490,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l 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"`' @@ -18678,7 +18778,7 @@ index 4f29887098..2127d39288 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"`' -@@ -13581,12 +14246,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13868,12 +14533,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod 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"`' @@ -18692,7 +18792,7 @@ index 4f29887098..2127d39288 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"`' -@@ -13641,8 +14306,13 @@ reload_flag \ +@@ -13928,8 +14593,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -18706,7 +18806,7 @@ index 4f29887098..2127d39288 100755 STRIP \ RANLIB \ CC \ -@@ -13652,12 +14322,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13939,12 +14609,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 \ @@ -18722,7 +18822,7 @@ index 4f29887098..2127d39288 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13673,7 +14345,6 @@ no_undefined_flag \ +@@ -13960,7 +14632,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -18730,7 +18830,7 @@ index 4f29887098..2127d39288 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13709,6 +14380,7 @@ module_cmds \ +@@ -13996,6 +14667,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -18738,7 +18838,7 @@ index 4f29887098..2127d39288 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14465,7 +15137,8 @@ $as_echo X"$file" | +@@ -14761,7 +15433,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, @@ -18748,7 +18848,7 @@ index 4f29887098..2127d39288 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14568,19 +15241,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14864,19 +15537,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -18792,7 +18892,7 @@ index 4f29887098..2127d39288 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14610,6 +15306,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14906,6 +15602,12 @@ global_symbol_to_c_name_address=$lt_lt_c # 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 @@ -18805,7 +18905,7 @@ index 4f29887098..2127d39288 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14619,6 +15321,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14915,6 +15617,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -18815,7 +18915,7 @@ index 4f29887098..2127d39288 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14733,12 +15438,12 @@ with_gcc=$GCC +@@ -15029,12 +15734,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -18831,7 +18931,7 @@ index 4f29887098..2127d39288 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14825,9 +15530,6 @@ inherit_rpath=$inherit_rpath +@@ -15121,9 +15826,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -18841,7 +18941,7 @@ index 4f29887098..2127d39288 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14843,6 +15545,9 @@ include_expsyms=$lt_include_expsyms +@@ -15139,6 +15841,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -18851,7 +18951,7 @@ index 4f29887098..2127d39288 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14875,210 +15580,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -15171,210 +15876,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? @@ -19053,15 +19153,9 @@ index 4f29887098..2127d39288 100755 -_LT_EOF - ;; - esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -+ + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -19219,17 +19313,20 @@ index 4f29887098..2127d39288 100755 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi -+ -+ + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index b07f3f3629..5a32d9b1fc 100644 ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -167,7 +167,7 @@ changequote(,)dnl +Index: git/opcodes/configure.ac +=================================================================== +--- git.orig/opcodes/configure.ac ++++ git/opcodes/configure.ac +@@ -166,7 +166,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -19238,11 +19335,11 @@ index b07f3f3629..5a32d9b1fc 100644 fi case "${host}" in -diff --git a/zlib/configure b/zlib/configure -index dc2d9ed383..ed9a492f5c 100755 ---- a/zlib/configure -+++ b/zlib/configure -@@ -614,8 +614,11 @@ OTOOL +Index: git/zlib/configure +=================================================================== +--- git.orig/zlib/configure ++++ git/zlib/configure +@@ -646,8 +646,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -19254,7 +19351,7 @@ index dc2d9ed383..ed9a492f5c 100755 OBJDUMP LN_S NM -@@ -737,6 +740,7 @@ enable_static +@@ -774,6 +777,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -19262,7 +19359,7 @@ index dc2d9ed383..ed9a492f5c 100755 enable_libtool_lock enable_host_shared ' -@@ -1385,6 +1389,8 @@ Optional Packages: +@@ -1428,6 +1432,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] @@ -19271,7 +19368,7 @@ index dc2d9ed383..ed9a492f5c 100755 Some influential environment variables: CC C compiler command -@@ -3910,8 +3916,8 @@ esac +@@ -4147,8 +4153,8 @@ esac @@ -19282,7 +19379,7 @@ index dc2d9ed383..ed9a492f5c 100755 -@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4188,7 +4194,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. @@ -19291,7 +19388,7 @@ index dc2d9ed383..ed9a492f5c 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 -@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -19302,13 +19399,13 @@ index dc2d9ed383..ed9a492f5c 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -4817,6 +4823,80 @@ esac +@@ -5054,6 +5060,80 @@ esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in @@ -19355,7 +19452,7 @@ index dc2d9ed383..ed9a492f5c 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. @@ -19382,8 +19479,8 @@ index dc2d9ed383..ed9a492f5c 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 : -@@ -4833,6 +4913,11 @@ case $reload_flag in + if ${lt_cv_ld_reload_flag+:} false; then : +@@ -5070,6 +5150,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -19395,7 +19492,7 @@ index dc2d9ed383..ed9a492f5c 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5001,7 +5086,8 @@ mingw* | pw32*) +@@ -5238,7 +5323,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -19405,7 +19502,7 @@ index dc2d9ed383..ed9a492f5c 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -5155,6 +5241,21 @@ esac +@@ -5392,6 +5478,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; } @@ -19427,7 +19524,7 @@ index dc2d9ed383..ed9a492f5c 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 -@@ -5168,11 +5269,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli @@ -19441,8 +19538,6 @@ index dc2d9ed383..ed9a492f5c 100755 + + + - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -19450,7 +19545,7 @@ index dc2d9ed383..ed9a492f5c 100755 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then @@ -19462,7 +19557,7 @@ index dc2d9ed383..ed9a492f5c 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -19490,7 +19585,7 @@ index dc2d9ed383..ed9a492f5c 100755 +set dummy dlltool; ac_word=$2 +{ $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_DLLTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then @@ -19502,7 +19597,7 @@ index dc2d9ed383..ed9a492f5c 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -19550,7 +19645,7 @@ index dc2d9ed383..ed9a492f5c 100755 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -19594,17 +19689,17 @@ index dc2d9ed383..ed9a492f5c 100755 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $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 : -@@ -5188,7 +5443,7 @@ do + if ${ac_cv_prog_AR+:} false; then : +@@ -5425,7 +5680,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; } +@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } fi @@ -19622,17 +19717,17 @@ index dc2d9ed383..ed9a492f5c 100755 +set dummy $ac_prog; ac_word=$2 { $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 : -@@ -5228,7 +5487,7 @@ do + if ${ac_cv_prog_ac_ct_AR+:} false; then : +@@ -5465,7 +5724,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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5247,6 +5506,10 @@ else +@@ -5484,6 +5743,10 @@ else $as_echo "no" >&6; } fi @@ -19643,7 +19738,7 @@ index dc2d9ed383..ed9a492f5c 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;; +@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -19655,20 +19750,16 @@ index dc2d9ed383..ed9a492f5c 100755 -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : ++if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no @@ -19678,7 +19769,7 @@ index dc2d9ed383..ed9a492f5c 100755 +int +main () +{ - ++ + ; + return 0; +} @@ -19704,23 +19795,30 @@ index dc2d9ed383..ed9a492f5c 100755 + fi + fi + rm -f conftest.* libconftest.a - ++ +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - ++ +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi - - - -@@ -5609,8 +5928,8 @@ esac ++ ++ ++ ++ ++ ++ ++ + 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 +@@ -5846,8 +6165,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 @@ -19731,7 +19829,7 @@ index dc2d9ed383..ed9a492f5c 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do +@@ -5883,6 +6202,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 @@ -19739,7 +19837,7 @@ index dc2d9ed383..ed9a492f5c 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -5687,6 +6007,18 @@ _LT_EOF +@@ -5924,6 +6244,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 @@ -19758,7 +19856,7 @@ index dc2d9ed383..ed9a492f5c 100755 #ifdef __cplusplus extern "C" { #endif -@@ -5698,7 +6030,7 @@ _LT_EOF +@@ -5935,7 +6267,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -19767,7 +19865,7 @@ index dc2d9ed383..ed9a492f5c 100755 const char *name; void *address; } -@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() { +@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -19778,7 +19876,7 @@ index dc2d9ed383..ed9a492f5c 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5735,8 +6067,8 @@ _LT_EOF +@@ -5972,8 +6304,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -19789,7 +19887,7 @@ index dc2d9ed383..ed9a492f5c 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -5773,6 +6105,19 @@ else +@@ -6010,6 +6342,18 @@ else $as_echo "ok" >&6; } fi @@ -19805,17 +19903,13 @@ index dc2d9ed383..ed9a492f5c 100755 + + + -+ -@@ -5790,6 +6135,41 @@ fi +@@ -6031,6 +6375,42 @@ fi -+ -+ -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -19842,16 +19936,20 @@ index dc2d9ed383..ed9a492f5c 100755 + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 +$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ ++ - - -@@ -6004,6 +6384,123 @@ esac + # Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then : +@@ -6241,6 +6621,123 @@ esac need_locks="$enable_libtool_lock" @@ -19860,7 +19958,7 @@ index dc2d9ed383..ed9a492f5c 100755 +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then @@ -19872,7 +19970,7 @@ index dc2d9ed383..ed9a492f5c 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -19900,7 +19998,7 @@ index dc2d9ed383..ed9a492f5c 100755 +set dummy mt; ac_word=$2 +{ $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_MANIFEST_TOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -19912,7 +20010,7 @@ index dc2d9ed383..ed9a492f5c 100755 + IFS=$as_save_IFS + 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 ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -19950,7 +20048,7 @@ index dc2d9ed383..ed9a492f5c 100755 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no @@ -19975,7 +20073,7 @@ index dc2d9ed383..ed9a492f5c 100755 case $host_os in rhapsody* | darwin*) -@@ -6570,6 +7067,8 @@ _LT_EOF +@@ -6807,6 +7304,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 @@ -19984,7 +20082,7 @@ index dc2d9ed383..ed9a492f5c 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7033,7 +7532,8 @@ fi +@@ -7269,7 +7768,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -19994,7 +20092,7 @@ index dc2d9ed383..ed9a492f5c 100755 -@@ -7122,7 +7622,7 @@ aix3*) +@@ -7358,7 +7858,7 @@ aix3*) esac # Global variables: @@ -20003,7 +20101,7 @@ index dc2d9ed383..ed9a492f5c 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7420,8 +7920,6 @@ fi +@@ -7656,8 +8156,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -20012,7 +20110,7 @@ index dc2d9ed383..ed9a492f5c 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -20025,7 +20123,7 @@ index dc2d9ed383..ed9a492f5c 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -20034,7 +20132,7 @@ index dc2d9ed383..ed9a492f5c 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -7706,13 +8210,17 @@ case $host_os in +@@ -7942,13 +8446,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -20047,7 +20145,7 @@ index dc2d9ed383..ed9a492f5c 100755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -20058,7 +20156,7 @@ index dc2d9ed383..ed9a492f5c 100755 # # Check to make sure the PIC flag actually works. -@@ -7773,6 +8281,11 @@ fi +@@ -8009,6 +8517,11 @@ fi @@ -20070,7 +20168,7 @@ index dc2d9ed383..ed9a492f5c 100755 # # Check to make sure the static flag actually works. # -@@ -8123,7 +8636,8 @@ _LT_EOF +@@ -8359,7 +8872,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -20080,7 +20178,7 @@ index dc2d9ed383..ed9a492f5c 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' -@@ -8222,12 +8736,12 @@ _LT_EOF +@@ -8458,12 +8972,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -20095,7 +20193,7 @@ index dc2d9ed383..ed9a492f5c 100755 fi ;; esac -@@ -8241,8 +8755,8 @@ _LT_EOF +@@ -8477,8 +8991,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -20106,7 +20204,7 @@ index dc2d9ed383..ed9a492f5c 100755 fi ;; -@@ -8260,8 +8774,8 @@ _LT_EOF +@@ -8496,8 +9010,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -20117,7 +20215,7 @@ index dc2d9ed383..ed9a492f5c 100755 else ld_shlibs=no fi -@@ -8307,8 +8821,8 @@ _LT_EOF +@@ -8543,8 +9057,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -20128,7 +20226,7 @@ index dc2d9ed383..ed9a492f5c 100755 else ld_shlibs=no fi -@@ -8438,7 +8952,13 @@ _LT_EOF +@@ -8674,7 +9188,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -20136,14 +20234,14 @@ index dc2d9ed383..ed9a492f5c 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test x$gcc_no_link = xyes; then - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 + as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8454,22 +8974,29 @@ main () +@@ -8690,22 +9210,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -20186,7 +20284,7 @@ index dc2d9ed383..ed9a492f5c 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" -@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -20194,14 +20292,14 @@ index dc2d9ed383..ed9a492f5c 100755 + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test x$gcc_no_link = xyes; then - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 + as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8497,22 +9030,29 @@ main () +@@ -8733,22 +9266,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -20244,7 +20342,7 @@ index dc2d9ed383..ed9a492f5c 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -20322,7 +20420,7 @@ index dc2d9ed383..ed9a492f5c 100755 ;; darwin* | rhapsody*) -@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -20331,7 +20429,7 @@ index dc2d9ed383..ed9a492f5c 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp hpux9*) if test "$GCC" = yes; then @@ -20340,7 +20438,7 @@ index dc2d9ed383..ed9a492f5c 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 -@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -20349,7 +20447,7 @@ index dc2d9ed383..ed9a492f5c 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -20362,7 +20460,7 @@ index dc2d9ed383..ed9a492f5c 100755 ;; esac else -@@ -8761,26 +9344,39 @@ fi +@@ -8997,26 +9580,39 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -20377,13 +20475,13 @@ index dc2d9ed383..ed9a492f5c 100755 + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + if test x$gcc_no_link = xyes; then - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 + as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20410,7 +20508,7 @@ index dc2d9ed383..ed9a492f5c 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' -@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -20419,7 +20517,7 @@ index dc2d9ed383..ed9a492f5c 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -20431,7 +20529,7 @@ index dc2d9ed383..ed9a492f5c 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -20443,7 +20541,7 @@ index dc2d9ed383..ed9a492f5c 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9732,13 +10329,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 @@ -20516,7 +20614,7 @@ index dc2d9ed383..ed9a492f5c 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -9594,7 +10249,7 @@ haiku*) +@@ -9830,7 +10485,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -20525,7 +20623,16 @@ index dc2d9ed383..ed9a492f5c 100755 hardcode_into_libs=yes ;; -@@ -10452,10 +11107,10 @@ else +@@ -10644,7 +11299,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10647 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10688,10 +11343,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)) @@ -20538,7 +20645,16 @@ index dc2d9ed383..ed9a492f5c 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10558,10 +11213,10 @@ else +@@ -10750,7 +11405,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10753 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10794,10 +11449,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)) @@ -20551,7 +20667,7 @@ index dc2d9ed383..ed9a492f5c 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11992,13 +12647,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -12266,13 +12921,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ 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"`' @@ -20572,7 +20688,7 @@ index dc2d9ed383..ed9a492f5c 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"`' -@@ -12013,14 +12675,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -12287,14 +12949,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l 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"`' @@ -20591,7 +20707,7 @@ index dc2d9ed383..ed9a492f5c 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"`' -@@ -12053,12 +12718,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -12327,12 +12992,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod 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"`' @@ -20605,7 +20721,7 @@ index dc2d9ed383..ed9a492f5c 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"`' -@@ -12113,8 +12778,13 @@ reload_flag \ +@@ -12387,8 +13052,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -20619,7 +20735,7 @@ index dc2d9ed383..ed9a492f5c 100755 STRIP \ RANLIB \ CC \ -@@ -12124,12 +12794,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -12398,12 +13068,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 \ @@ -20635,7 +20751,7 @@ index dc2d9ed383..ed9a492f5c 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -12145,7 +12817,6 @@ no_undefined_flag \ +@@ -12419,7 +13091,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -20643,7 +20759,7 @@ index dc2d9ed383..ed9a492f5c 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -12181,6 +12852,7 @@ module_cmds \ +@@ -12455,6 +13126,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -20651,7 +20767,7 @@ index dc2d9ed383..ed9a492f5c 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -12770,7 +13442,8 @@ $as_echo X"$file" | +@@ -13053,7 +13725,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, @@ -20661,7 +20777,7 @@ index dc2d9ed383..ed9a492f5c 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -12873,19 +13546,42 @@ SP2NL=$lt_lt_SP2NL +@@ -13156,19 +13829,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -20705,7 +20821,7 @@ index dc2d9ed383..ed9a492f5c 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -12915,6 +13611,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -13198,6 +13894,12 @@ global_symbol_to_c_name_address=$lt_lt_c # 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 @@ -20718,7 +20834,7 @@ index dc2d9ed383..ed9a492f5c 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -12924,6 +13626,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -13207,6 +13909,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -20728,7 +20844,7 @@ index dc2d9ed383..ed9a492f5c 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -13038,12 +13743,12 @@ with_gcc=$GCC +@@ -13321,12 +14026,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -20744,7 +20860,7 @@ index dc2d9ed383..ed9a492f5c 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -13130,9 +13835,6 @@ inherit_rpath=$inherit_rpath +@@ -13413,9 +14118,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -20754,7 +20870,7 @@ index dc2d9ed383..ed9a492f5c 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -13148,6 +13850,9 @@ include_expsyms=$lt_include_expsyms +@@ -13431,6 +14133,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -20764,7 +20880,7 @@ index dc2d9ed383..ed9a492f5c 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -13180,210 +13885,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -13463,210 +14168,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? @@ -20966,15 +21082,9 @@ index dc2d9ed383..ed9a492f5c 100755 -_LT_EOF - ;; - esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -+ + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -21132,12 +21242,12 @@ index dc2d9ed383..ed9a492f5c 100755 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi -+ -+ + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" --- -2.16.1 - diff --git a/poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch index 4a5127380..18ef6bb7f 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch @@ -1,4 +1,4 @@ -From 697903256e09533778baa8af66402c44d70219d9 Mon Sep 17 00:00:00 2001 +From ef50d848d983f81e4a86dd3eef4933e3579336f1 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/15] Add the armv5e architecture to binutils @@ -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 ec50420518..a25d1721af 100644 +index 3f5384e1c7..8d5bc145af 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c -@@ -26195,6 +26195,7 @@ static const struct arm_arch_option_table arm_archs[] = +@@ -26294,6 +26294,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 ec50420518..a25d1721af 100644 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP), -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 939be67b5..6999ed9c9 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From 622d66634eb2e509d4126f5bdcab26de367241a1 Mon Sep 17 00:00:00 2001 +From ca25d55cef8398bad508c2b2be29aea5aa3c4d26 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/15] don't let the distro compiler point to the wrong @@ -31,5 +31,5 @@ index ed1b334c36..d4ffd8b57b 100644 if test -n "${target_header_dir}"; then \ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch b/poky/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index e75104722..9a9e31962 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From 27e38ee92c24fca86b1c3f6ef156a1892dd06bfd Mon Sep 17 00:00:00 2001 +From a3667059fc0d52d890b505bed0e5050ea3d7002e 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/15] warn for uses of system directories when cross linking @@ -55,7 +55,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> ld/configure | 16 ++++++++++++++++ ld/configure.ac | 10 ++++++++++ ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ + ld/ld.texi | 12 ++++++++++++ ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ @@ -63,10 +63,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 9 files changed, 86 insertions(+) diff --git a/ld/config.in b/ld/config.in -index a846743da6..df3cd5fb60 100644 +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -27,6 +27,9 @@ +@@ -31,6 +31,9 @@ language is requested. */ #undef ENABLE_NLS @@ -77,10 +77,10 @@ index a846743da6..df3cd5fb60 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index db8b998722..489ead5c13 100755 +index 2b291f0da8..facc386563 100755 --- a/ld/configure +++ b/ld/configure -@@ -789,6 +789,7 @@ with_lib_path +@@ -826,6 +826,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -88,7 +88,7 @@ index db8b998722..489ead5c13 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1448,6 +1449,8 @@ Optional Features: +@@ -1490,6 +1491,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 db8b998722..489ead5c13 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got=<type> GOT handling scheme (target, single, negative, multigot) -@@ -16315,6 +16318,19 @@ fi +@@ -16618,6 +16621,19 @@ fi @@ -118,10 +118,10 @@ index db8b998722..489ead5c13 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 bada1b50b0..d074a3820b 100644 +index d10c553650..9f1b57b120 100644 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) +@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -157,11 +157,11 @@ index ba914b921e..9df17dab6c 100644 /* Big or little endian as set on command line. */ enum endian_enum endian; -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index c89915f1aa..df430837e2 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2498,6 +2498,18 @@ string identifying the original linked file does not change. +diff --git a/ld/ld.texi b/ld/ld.texi +index b9fe2324da..43486605e0 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2479,6 +2479,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 c89915f1aa..df430837e2 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index 6532a57d96..f943f0b2e5 100644 +index a72ff13526..dc5148f748 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) @@ -209,10 +209,10 @@ index 6532a57d96..f943f0b2e5 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 140ed1d9da..9965cbc04f 100644 +index 04d6fd5f96..d7df005bb2 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -147,6 +147,8 @@ enum option_values +@@ -148,6 +148,8 @@ enum option_values OPTION_REQUIRE_DEFINED_SYMBOL, OPTION_ORPHAN_HANDLING, OPTION_FORCE_GROUP_ALLOCATION, @@ -222,10 +222,10 @@ index 140ed1d9da..9965cbc04f 100644 /* The initial parser states. */ diff --git a/ld/ldmain.c b/ld/ldmain.c -index c473ed24c3..adae0b4610 100644 +index f31eeb29c3..25f8497888 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -261,6 +261,8 @@ main (int argc, char **argv) +@@ -268,6 +268,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 c473ed24c3..adae0b4610 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 f2191602d4..bccb3bdeef 100644 +index 86a033a383..4a40d48020 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] = +@@ -543,6 +543,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,8 +253,8 @@ index f2191602d4..bccb3bdeef 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1568,6 +1576,14 @@ parse_args (unsigned argc, char **argv) - einfo (_("%P%F: invalid argument to option" +@@ -1577,6 +1585,14 @@ parse_args (unsigned argc, char **argv) + einfo (_("%F%P: invalid argument to option" " \"--orphan-handling\"\n")); break; + @@ -269,5 +269,5 @@ index f2191602d4..bccb3bdeef 100644 } -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index 33dfff9bd..8fc00ff45 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From e205ae05c41a8cc8d47708f0a3b6f740e2bf2526 Mon Sep 17 00:00:00 2001 +From 9e1d8f9a657a8bd48048c2ea6407cf60b723bd68 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/15] Fix rpath in libtool when sysroot is enabled @@ -48,5 +48,5 @@ index 70e856e065..11ee684ccc 100644 if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index 80fcbc119..2e93b129d 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From 7978c1299021033c35c29c94e0997235f7ede248 Mon Sep 17 00:00:00 2001 +From 2d2e2fcdd9646849716ee99d8d3e5d72ae8889bc 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/15] Change default emulation for mips64*-*-linux @@ -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 f04a993f06..8777f96bd2 100644 +index 6391f35684..8a11c0680a 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -1189,12 +1189,12 @@ case "${targ}" in +@@ -913,12 +913,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 f04a993f06..8777f96bd2 100644 mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec diff --git a/ld/configure.tgt b/ld/configure.tgt -index 6183a85b3d..1d78465590 100644 +index fad8b2e5c8..7fb2168503 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -535,11 +535,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks +@@ -464,11 +464,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 6183a85b3d..1d78465590 100644 mips*el-*-linux-*) targ_emul=elf32ltsmip targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch b/poky/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index 1fefb680f..4d64bd53f 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,4 +1,4 @@ -From 3b40bf584615f794b85fd50d4d0a5c0a1d2ee7bf Mon Sep 17 00:00:00 2001 +From 96ff7570c29f792c466a933529fefda9b8e97994 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/15] Add support for Netlogic XLP @@ -34,10 +34,10 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 14 files changed, 61 insertions(+), 21 deletions(-) diff --git a/bfd/aoutx.h b/bfd/aoutx.h -index eec9c4ad2a..3bf0a71e63 100644 +index 023843b0be..46246fec2d 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -814,6 +814,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, +@@ -798,6 +798,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -46,10 +46,10 @@ index eec9c4ad2a..3bf0a71e63 100644 arch_flags = M_MIPS2; break; diff --git a/bfd/archures.c b/bfd/archures.c -index e83c57a2f3..3016ea1bae 100644 +index 282e983086..b38b05d132 100644 --- a/bfd/archures.c +++ b/bfd/archures.c -@@ -201,6 +201,7 @@ DESCRIPTION +@@ -183,6 +183,7 @@ DESCRIPTION .#define bfd_mach_mips_octeon3 6503 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR'. *} .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *} @@ -58,10 +58,10 @@ index e83c57a2f3..3016ea1bae 100644 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 42991e7848..27abc5d5a8 100644 +index 93745bd3fd..326e9e49ed 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2062,6 +2062,7 @@ enum bfd_architecture +@@ -2054,6 +2054,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -70,10 +70,10 @@ index 42991e7848..27abc5d5a8 100644 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 diff --git a/bfd/config.bfd b/bfd/config.bfd -index 8777f96bd2..7b80bda8c9 100644 +index 8a11c0680a..c882421343 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -1172,6 +1172,11 @@ case "${targ}" in +@@ -896,6 +896,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -110,10 +110,10 @@ index cb50c64371..2b9d1d6ecf 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 285401367d..14ebb5f175 100644 +index d91942301c..5d1bd3f0b1 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c -@@ -6806,6 +6806,9 @@ _bfd_elf_mips_mach (flagword flags) +@@ -6805,6 +6805,9 @@ _bfd_elf_mips_mach (flagword flags) case E_MIPS_MACH_IAMR2: return bfd_mach_mips_interaptiv_mr2; @@ -123,7 +123,7 @@ index 285401367d..14ebb5f175 100644 default: switch (flags & EF_MIPS_ARCH) { -@@ -11963,6 +11966,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12003,6 +12006,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -134,7 +134,7 @@ index 285401367d..14ebb5f175 100644 case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -13936,6 +13943,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = +@@ -13992,6 +13999,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 }, @@ -143,10 +143,10 @@ index 285401367d..14ebb5f175 100644 /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, diff --git a/binutils/readelf.c b/binutils/readelf.c -index ae1cda9a7b..fed0387a94 100644 +index 2b78db219b..7a7178925f 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3370,6 +3370,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) +@@ -3403,6 +3403,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -155,7 +155,7 @@ index ae1cda9a7b..fed0387a94 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 c135131b59..d8fbda8e31 100644 +index 59df787155..48537226c0 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -552,6 +552,7 @@ static int mips_32bitmode = 0; @@ -174,7 +174,7 @@ index c135131b59..d8fbda8e31 100644 ) /* Whether the processor uses hardware interlocks to protect reads -@@ -19737,7 +19739,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = +@@ -19778,7 +19780,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. */ @@ -184,10 +184,10 @@ index c135131b59..d8fbda8e31 100644 /* MIPS 64 Release 6 */ { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, diff --git a/gas/configure b/gas/configure -index a40ac2144f..65a6995243 100755 +index 134278fa25..2fdca147a1 100755 --- a/gas/configure +++ b/gas/configure -@@ -12989,6 +12989,9 @@ _ACEOF +@@ -13336,6 +13336,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; @@ -198,7 +198,7 @@ index a40ac2144f..65a6995243 100755 mips_cpu=r3900 ;; diff --git a/include/elf/mips.h b/include/elf/mips.h -index 9de0b4e175..74fc4f7e55 100644 +index 4e2cde3279..c329f38929 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -210,10 +210,10 @@ index 9de0b4e175..74fc4f7e55 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 5eea72f139..90f6d57e15 100644 +index 1ab1780567..74f457b579 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1259,6 +1259,8 @@ static const unsigned int mips_isa_table[] = { +@@ -1262,6 +1262,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -222,7 +222,7 @@ index 5eea72f139..90f6d57e15 100644 /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1365,6 +1367,7 @@ static const unsigned int mips_isa_table[] = { +@@ -1373,6 +1375,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -230,7 +230,7 @@ index 5eea72f139..90f6d57e15 100644 /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1445,6 +1448,9 @@ cpu_is_member (int cpu, unsigned int mask) +@@ -1453,6 +1456,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -241,10 +241,10 @@ index 5eea72f139..90f6d57e15 100644 return FALSE; } diff --git a/ld/configure.tgt b/ld/configure.tgt -index 1d78465590..307e787b64 100644 +index 7fb2168503..a1db7adfe2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -521,6 +521,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*) +@@ -450,6 +450,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" ;; @@ -254,10 +254,10 @@ index 1d78465590..307e787b64 100644 targ_extra_emuls="elf32lr5900" targ_extra_libpath=$targ_extra_emuls ;; diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c -index 984fcbb802..95b107d216 100644 +index bbf21328e8..38e487c16f 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -655,13 +655,11 @@ const struct mips_arch_choice mips_arch_choices[] = +@@ -656,13 +656,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -277,10 +277,10 @@ index 984fcbb802..95b107d216 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 180d613c93..65b7b8cc23 100644 +index 1cbcbc6abc..e1fbdc89de 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c -@@ -328,6 +328,7 @@ decode_mips_operand (const char *p) +@@ -329,6 +329,7 @@ decode_mips_operand (const char *p) #define IOCT3 INSN_OCTEON3 #define XLR INSN_XLR #define IAMR2 INSN_INTERAPTIV_MR2 @@ -288,7 +288,7 @@ index 180d613c93..65b7b8cc23 100644 #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -966,6 +967,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -974,6 +975,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 }, @@ -296,7 +296,7 @@ index 180d613c93..65b7b8cc23 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 }, -@@ -998,12 +1000,13 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1006,12 +1008,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 }, @@ -311,7 +311,7 @@ index 180d613c93..65b7b8cc23 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 }, -@@ -1075,6 +1078,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1083,6 +1086,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 }, @@ -319,7 +319,7 @@ index 180d613c93..65b7b8cc23 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 }, -@@ -1090,6 +1094,8 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1098,6 +1102,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 }, @@ -328,7 +328,7 @@ index 180d613c93..65b7b8cc23 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 }, -@@ -1243,9 +1249,9 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1251,9 +1257,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 }, @@ -341,7 +341,7 @@ index 180d613c93..65b7b8cc23 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 }, -@@ -1410,7 +1416,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1418,7 +1424,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 }, @@ -350,7 +350,7 @@ index 180d613c93..65b7b8cc23 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 }, -@@ -1455,10 +1461,13 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1463,10 +1469,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 }, @@ -366,7 +366,7 @@ index 180d613c93..65b7b8cc23 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 }, -@@ -1508,7 +1517,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1516,7 +1525,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 }, @@ -375,7 +375,7 @@ index 180d613c93..65b7b8cc23 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 }, -@@ -1945,9 +1954,9 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1953,9 +1962,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 }, @@ -389,5 +389,5 @@ index 180d613c93..65b7b8cc23 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.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/poky/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index c3e1b1384..c9ffdada9 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From 27ec22ca3cd56cfdf060d2e1f414bedce269b322 Mon Sep 17 00:00:00 2001 +From d45455db35db5693c5efe0e1b384295e4c0db998 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 13/15] fix the incorrect assembling for ppc wait mnemonic @@ -11,10 +11,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index bb17f26c2e..dbdd762b4e 100644 +index 4a0fca5f0a..49f72fc35c 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c -@@ -5338,7 +5338,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { +@@ -5351,7 +5351,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}}, @@ -22,7 +22,7 @@ index bb17f26c2e..dbdd762b4e 100644 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, -@@ -5392,7 +5391,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { +@@ -5405,7 +5404,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}}, @@ -32,5 +32,5 @@ index bb17f26c2e..dbdd762b4e 100644 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch b/poky/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index cf3690f25..6197df6d5 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,4 +1,4 @@ -From 7dfbd6889d868a09d695dd2736104848c1a9c9c3 Mon Sep 17 00:00:00 2001 +From 9af90cfc35ff1fe78755578861473039836c467a 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 14/15] Detect 64-bit MIPS targets @@ -46,5 +46,5 @@ index 8aef22a318..7030026ffa 100644 targ_obj=mips targ_machine=EM_MIPS -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index 8c9fd237e..7dc8ba8c3 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 298804f430939d6cc94b09732ee93e64c5e6be18 Mon Sep 17 00:00:00 2001 +From f9e26bd29b5f017ea1307b51b5036063bff78600 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 @@ -85,5 +85,5 @@ index 11ee684ccc..3b19ac1532 100644 elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in -- -2.16.1 +2.18.0 diff --git a/poky/meta/recipes-devtools/binutils/binutils/0016-add-i386pep-emulation-for-x86_64.patch b/poky/meta/recipes-devtools/binutils/binutils/0016-add-i386pep-emulation-for-x86_64.patch new file mode 100644 index 000000000..9f20784eb --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/0016-add-i386pep-emulation-for-x86_64.patch @@ -0,0 +1,41 @@ +binutils : enable x86_64-pep for producing EFI binaries on x86-64 + +Add x86_64-pep emulation support to the set enabled for x86_64 targets +to enable the linker to produce Portable Executables for EFI binaries. + +Enables building the x86-64 EFI variant of the Xen hypervisor for +the OpenXT Project. + +Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> + +Upstream-Status: Inappropriate [OE configuration specific] +--- +diff --git a/bfd/config.bfd b/bfd/config.bfd +index c882421..dc705b6 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -688,7 +688,7 @@ case "${targ}" in + ;; + x86_64-*-linux-*) + targ_defvec=x86_64_elf64_vec +- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" ++ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec" + want64=true + ;; + x86_64-*-nacl*) +diff --git a/ld/configure.tgt b/ld/configure.tgt +index a1db7ad..65a984a 100644 +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -253,8 +253,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x86_64 + tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` + tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; + x86_64-*-linux-*) targ_emul=elf_x86_64 +- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" +- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" ++ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" ++ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" ++ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" + tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; + i[3-7]86-*-redox*) targ_emul=elf_i386 + targ_extra_emuls=elf_x86_64 ;; diff --git a/poky/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch b/poky/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch new file mode 100644 index 000000000..265e52633 --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch @@ -0,0 +1,59 @@ +From 2a50366ded329bfb39d387253450c9d5302c3503 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 14 Aug 2018 12:22:35 +0100 +Subject: [PATCH] as.c: Improve check for input file matching output file. + +When the assembler reports that the input and output are the same, report the +file names involved, in order to help debugging. Also do not equate two files +are the same if the have the same inode value but reside on different file +systems. + +Upstream-Status: Backport + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + gas/as.c | 27 ++++++++++++++++++++------- + 2 files changed, 20 insertions(+), 7 deletions(-) + +diff --git a/gas/as.c b/gas/as.c +index b2a908a..3105d06 100644 +--- a/gas/as.c ++++ b/gas/as.c +@@ -1259,14 +1259,27 @@ main (int argc, char ** argv) + { + struct stat sib; + +- if (stat (argv[i], &sib) == 0) ++ /* Check that the input file and output file are different. */ ++ if (stat (argv[i], &sib) == 0 ++ && sib.st_ino == sob.st_ino ++ /* POSIX emulating systems may support stat() but if the ++ underlying file system does not support a file serial number ++ of some kind then they will return 0 for the inode. So ++ two files with an inode of 0 may not actually be the same. ++ On real POSIX systems no ordinary file will ever have an ++ inode of 0. */ ++ && sib.st_ino != 0 ++ /* Different files may have the same inode number if they ++ reside on different devices, so check the st_dev field as ++ well. */ ++ && sib.st_dev == sob.st_dev) + { +- if (sib.st_ino == sob.st_ino && sib.st_ino != 0) +- { +- /* Don't let as_fatal remove the output file! */ +- out_file_name = NULL; +- as_fatal (_("The input and output files must be distinct")); +- } ++ const char *saved_out_file_name = out_file_name; ++ ++ /* Don't let as_fatal remove the output file! */ ++ out_file_name = NULL; ++ as_fatal (_("The input '%s' and output '%s' files are the same"), ++ argv[i], saved_out_file_name); + } + } + } +-- +2.7.4 + diff --git a/poky/meta/recipes-devtools/binutils/binutils/0018-Refactored-location-where-GOT-information-is-collect.patch b/poky/meta/recipes-devtools/binutils/binutils/0018-Refactored-location-where-GOT-information-is-collect.patch new file mode 100644 index 000000000..d41339a9a --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/0018-Refactored-location-where-GOT-information-is-collect.patch @@ -0,0 +1,201 @@ +From d930affa2d475d1cc6792f1e6d56bef3d6c617db Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda <cmiranda@synopsys.com> +Date: Fri, 2 Mar 2018 17:16:21 +0100 +Subject: [PATCH] Refactored location where GOT information is collected. + +Change location where GOT information is collected for ARC target, avoiding +posible use conflicts of the previous .got field in the symbols hash_entry. + +bfd/ +2018-03-01 Cupertino Miranda <cmiranda@synopsys.com> + + * arc-got.h (get_got_entry_list_for_symbol): Changed. + * ef32-arc.c (struct elf_arc_link_hash_entry): Moved and changed. + (elf_arc_link_hash_newfunc): Changed. + (arc_elf_link_hash_table_create): Removed old initializations. + (elf_arc_relocate_section, elf_arc_finish_dynamic_symbol): Changed. + +Signed-off-by: Cupertino Miranda <cmiranda@synopsys.com> +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> +[Romain: rebase on top of 2.31] +Signed-off-by: Romain Naour <romain.naour@gmail.com> + +Upstream-Status: Pending +--- + bfd/arc-got.h | 6 +++-- + bfd/elf32-arc.c | 77 +++++++++++++++++++++++++++++++-------------------------- + 2 files changed, 46 insertions(+), 37 deletions(-) + +diff --git a/bfd/arc-got.h b/bfd/arc-got.h +index a86061bcb38..81ce88fe21a 100644 +--- a/bfd/arc-got.h ++++ b/bfd/arc-got.h +@@ -156,9 +156,11 @@ get_got_entry_list_for_symbol (bfd *abfd, + unsigned long r_symndx, + struct elf_link_hash_entry *h) + { +- if (h != NULL) ++ struct elf_arc_link_hash_entry *h1 = ++ ((struct elf_arc_link_hash_entry *) h); ++ if (h1 != NULL) + { +- return &h->got.glist; ++ return &h1->got_ents; + } + else + { +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index a48ef0ca15f..ab84de43815 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -160,6 +160,18 @@ struct arc_relocation_data + const char * symbol_name; + }; + ++/* ARC ELF linker hash entry. */ ++struct elf_arc_link_hash_entry ++{ ++ struct elf_link_hash_entry root; ++ ++ /* Track dynamic relocs copied for this symbol. */ ++ struct elf_dyn_relocs *dyn_relocs; ++ ++ struct got_entry *got_ents; ++}; ++ ++ + /* Should be included at this location due to static declarations + defined before this point. */ + #include "arc-got.h" +@@ -281,15 +293,6 @@ struct arc_reloc_map + unsigned char elf_reloc_val; + }; + +-/* ARC ELF linker hash entry. */ +-struct elf_arc_link_hash_entry +-{ +- struct elf_link_hash_entry root; +- +- /* Track dynamic relocs copied for this symbol. */ +- struct elf_dyn_relocs *dyn_relocs; +-}; +- + /* ARC ELF linker hash table. */ + struct elf_arc_link_hash_table + { +@@ -301,28 +304,28 @@ elf_arc_link_hash_newfunc (struct bfd_hash_entry *entry, + struct bfd_hash_table *table, + const char *string) + { ++ struct elf_arc_link_hash_entry * ret = ++ (struct elf_arc_link_hash_entry *) entry; ++ + /* Allocate the structure if it has not already been allocated by a + subclass. */ +- if (entry == NULL) +- { +- entry = (struct bfd_hash_entry *) +- bfd_hash_allocate (table, +- sizeof (struct elf_arc_link_hash_entry)); +- if (entry == NULL) +- return entry; +- } ++ if (ret == NULL) ++ ret = (struct elf_arc_link_hash_entry *) ++ bfd_hash_allocate (table, sizeof (struct elf_arc_link_hash_entry)); ++ if (ret == NULL) ++ return (struct bfd_hash_entry *) ret; + + /* Call the allocation method of the superclass. */ +- entry = _bfd_elf_link_hash_newfunc (entry, table, string); +- if (entry != NULL) ++ ret = ((struct elf_arc_link_hash_entry *) ++ _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret, ++ table, string)); ++ if (ret != NULL) + { +- struct elf_arc_link_hash_entry *eh; +- +- eh = (struct elf_arc_link_hash_entry *) entry; +- eh->dyn_relocs = NULL; ++ ret->dyn_relocs = NULL; ++ ret->got_ents = NULL; + } + +- return entry; ++ return (struct bfd_hash_entry *) ret; + } + + /* Destroy an ARC ELF linker hash table. */ +@@ -352,11 +355,6 @@ arc_elf_link_hash_table_create (bfd *abfd) + return NULL; + } + +- ret->elf.init_got_refcount.refcount = 0; +- ret->elf.init_got_refcount.glist = NULL; +- ret->elf.init_got_offset.offset = 0; +- ret->elf.init_got_offset.glist = NULL; +- + ret->elf.root.hash_table_free = elf_arc_link_hash_table_free; + + return &ret->elf.root; +@@ -1615,10 +1613,14 @@ elf_arc_relocate_section (bfd * output_bfd, + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + { +- struct elf_link_hash_entry *h_old = h; ++ struct elf_arc_link_hash_entry *ah_old = ++ (struct elf_arc_link_hash_entry *) h; + h = (struct elf_link_hash_entry *) h->root.u.i.link; +- if (h->got.glist == 0 && h_old->got.glist != h->got.glist) +- h->got.glist = h_old->got.glist; ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; ++ ++ if (ah->got_ents == 0 && ah_old->got_ents != ah->got_ents) ++ ah->got_ents = ah_old->got_ents; + } + + /* TODO: Need to validate what was the intention. */ +@@ -1636,6 +1638,8 @@ elf_arc_relocate_section (bfd * output_bfd, + + if (is_reloc_for_GOT (howto) && !bfd_link_pic (info)) + { ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; + /* TODO: Change it to use arc_do_relocation with + ARC_32 reloc. Try to use ADD_RELA macro. */ + bfd_vma relocation = +@@ -1645,8 +1649,8 @@ elf_arc_relocate_section (bfd * output_bfd, + + reloc_data.sym_section->output_section->vma) + : 0); + +- BFD_ASSERT (h->got.glist); +- bfd_vma got_offset = h->got.glist->offset; ++ BFD_ASSERT (ah->got_ents); ++ bfd_vma got_offset = ah->got_ents->offset; + bfd_put_32 (output_bfd, relocation, + htab->sgot->contents + got_offset); + } +@@ -1958,6 +1962,7 @@ elf_arc_check_relocs (bfd * abfd, + else /* Global one. */ + h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + ++ + switch (r_type) + { + case R_ARC_32: +@@ -2404,7 +2409,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, + create respective dynamic relocs. */ + /* TODO: Make function to get list and not access the list directly. */ + /* TODO: Move function to relocate_section create this relocs eagerly. */ +- create_got_dynrelocs_for_got_info (&h->got.glist, ++ struct elf_arc_link_hash_entry *ah = ++ (struct elf_arc_link_hash_entry *) h; ++ create_got_dynrelocs_for_got_info (&ah->got_ents, + output_bfd, + info, + h); +-- +2.14.4 + diff --git a/poky/meta/recipes-devtools/binutils/binutils/0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch b/poky/meta/recipes-devtools/binutils/binutils/0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch new file mode 100644 index 000000000..6a58ee06a --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch @@ -0,0 +1,38 @@ +From 955176bd999fe80c5b937ab8786665079e35c387 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda <cmiranda@synopsys.com> +Date: Fri, 2 Mar 2018 17:33:48 +0100 +Subject: [PATCH] Improved robustness. Return FALSE in case of NULL pointer. + +bfd/ +2018-03-01 Cupertino Miranda <cmiranda@synopsys.com> + + * elf32-arc.c (elf_arc_finish_dynamic_symbol) Return FALSE in case + arc_htab is NULL. + +Signed-off-by: Cupertino Miranda <cmiranda@synopsys.com> +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> +[Romain: rebase on top of 2.31] +Signed-off-by: Romain Naour <romain.naour@gmail.com> + +Upstream-Status: Pending +--- + bfd/elf32-arc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index ab84de43815..33fc72cff6e 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -2420,6 +2420,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, + { + struct elf_arc_link_hash_table *arc_htab = elf_arc_hash_table (info); + ++ if(arc_htab == NULL) ++ return FALSE; ++ + if (h->dynindx == -1 + || (h->root.type != bfd_link_hash_defined + && h->root.type != bfd_link_hash_defweak) +-- +2.14.4 + diff --git a/poky/meta/recipes-devtools/binutils/binutils/0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch b/poky/meta/recipes-devtools/binutils/binutils/0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch new file mode 100644 index 000000000..01e42c03b --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch @@ -0,0 +1,46 @@ +From 9d09ce14b4eef2b56f24660fd69a44acd45128b2 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda <cmiranda@synopsys.com> +Date: Fri, 2 Mar 2018 17:38:14 +0100 +Subject: [PATCH] Make sure global symbol is not an indirect or warning. + +Problem identified in the context of glibc with latest upstream binutils. +Dynamic symbol space was being reserved but, no actual information for the +symbol was being set. Data for the symbol was kept initialized with -1. +No easy test case was possible to be created. + +bfd/ +2018-03-01 Cupertino Miranda <cmiranda@synopsys.com> + + * elf32-arc.c (elf_arc_check_relocs): Changed. + +Signed-off-by: Cupertino Miranda <cmiranda@synopsys.com> +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> +[Romain: rebase on top of 2.31] +Signed-off-by: Romain Naour <romain.naour@gmail.com> + +Upstream-Status: Pending +--- + bfd/elf32-arc.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 33fc72cff6e..9b72c5b4f4f 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -1960,7 +1960,12 @@ elf_arc_check_relocs (bfd * abfd, + if (r_symndx < symtab_hdr->sh_info) /* Is a local symbol. */ + h = NULL; + else /* Global one. */ +- h = sym_hashes[r_symndx - symtab_hdr->sh_info]; ++ { ++ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; ++ while (h->root.type == bfd_link_hash_indirect ++ || h->root.type == bfd_link_hash_warning) ++ h = (struct elf_link_hash_entry *) h->root.u.i.link; ++ } + + + switch (r_type) +-- +2.14.4 + diff --git a/poky/meta/recipes-devtools/binutils/binutils/0021-PLT-information-was-still-being-generated-when-symbo.patch b/poky/meta/recipes-devtools/binutils/binutils/0021-PLT-information-was-still-being-generated-when-symbo.patch new file mode 100644 index 000000000..9e942399c --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/0021-PLT-information-was-still-being-generated-when-symbo.patch @@ -0,0 +1,40 @@ +From e4861c68067cb2166b4c2bb9c052abeb6ad9aaa1 Mon Sep 17 00:00:00 2001 +From: Cupertino Miranda <cmiranda@synopsys.com> +Date: Fri, 2 Mar 2018 17:44:29 +0100 +Subject: [PATCH] PLT information was still being generated when symbol was + forced_local. + +A change upstream reveiled this issue, triggering an assert when linking glibc. + +bfd/ +2018-03-01 Cupertino Miranda <cmiranda@synopsys.com> + + * elf32-arc.c (elf_arc_check_relocs): Changed. + +Signed-off-by: Cupertino Miranda <cmiranda@synopsys.com> +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> +[Romain: rebase on top of 2.31] +Signed-off-by: Romain Naour <romain.naour@gmail.com> + +Upstream-Status: Pending +--- + bfd/elf32-arc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 9b72c5b4f4f..b40b463d34d 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -2041,7 +2041,8 @@ elf_arc_check_relocs (bfd * abfd, + if (h == NULL) + continue; + else +- h->needs_plt = 1; ++ if(h->forced_local == 0) ++ h->needs_plt = 1; + } + + /* Add info to the symbol got_entry_list. */ +-- +2.14.4 + diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10372.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10372.patch deleted file mode 100644 index 053e9d8d6..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10372.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6aea08d9f3e3d6475a65454da488a0c51f5dc97d Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Tue, 17 Apr 2018 12:35:55 +0100 -Subject: [PATCH] Fix illegal memory access when parsing corrupt DWARF - information. - - PR 23064 - * dwarf.c (process_cu_tu_index): Test for a potential buffer - overrun before copying signature pointer. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-10372 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - binutils/ChangeLog | 6 ++++++ - binutils/dwarf.c | 13 ++++++++++++- - 2 files changed, 18 insertions(+), 1 deletion(-) - -Index: git/binutils/dwarf.c -=================================================================== ---- git.orig/binutils/dwarf.c -+++ git/binutils/dwarf.c -@@ -9252,7 +9252,18 @@ process_cu_tu_index (struct dwarf_sectio - } - - if (!do_display) -- memcpy (&this_set[row - 1].signature, ph, sizeof (uint64_t)); -+ { -+ size_t num_copy = sizeof (uint64_t); -+ -+ /* PR 23064: Beware of buffer overflow. */ -+ if (ph + num_copy < limit) -+ memcpy (&this_set[row - 1].signature, ph, num_copy); -+ else -+ { -+ warn (_("Signature (%p) extends beyond end of space in section\n"), ph); -+ return 0; -+ } -+ } - - prow = poffsets + (row - 1) * ncols * 4; - /* PR 17531: file: b8ce60a8. */ -Index: git/binutils/ChangeLog -=================================================================== ---- git.orig/binutils/ChangeLog -+++ git/binutils/ChangeLog -@@ -1,3 +1,9 @@ -+2018-04-17 Nick Clifton <nickc@redhat.com> -+ -+ PR 23064 -+ * dwarf.c (process_cu_tu_index): Test for a potential buffer -+ overrun before copying signature pointer. -+ - 2018-01-27 Nick Clifton <nickc@redhat.com> - - Back to development. diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10373.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10373.patch deleted file mode 100644 index d547cf115..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10373.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6327533b1fd29fa86f6bf34e61c332c010e3c689 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Tue, 17 Apr 2018 14:30:07 +0100 -Subject: [PATCH] Add a check for a NULL table pointer before attempting to - compute a DWARF filename. - - PR 23065 - * dwarf2.c (concat_filename): Check for a NULL table pointer. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-10373 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - bfd/ChangeLog | 5 +++++ - bfd/dwarf2.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -Index: git/bfd/dwarf2.c -=================================================================== ---- git.orig/bfd/dwarf2.c -+++ git/bfd/dwarf2.c -@@ -1565,7 +1565,7 @@ concat_filename (struct line_info_table - { - char *filename; - -- if (file - 1 >= table->num_files) -+ if (table == NULL || file - 1 >= table->num_files) - { - /* FILE == 0 means unknown. */ - if (file) -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,3 +1,8 @@ -+2018-04-17 Nick Clifton <nickc@redhat.com> -+ -+ PR 23065 -+ * dwarf2.c (concat_filename): Check for a NULL table pointer. -+ - 2018-01-29 Alan Modra <amodra@gmail.com> - - PR 22741 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10534.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10534.patch deleted file mode 100644 index 6847020a9..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10534.patch +++ /dev/null @@ -1,3429 +0,0 @@ -From aa4a8c2a2a67545e90c877162c53cc9de42dc8b4 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Tue, 24 Apr 2018 16:31:27 +0100 -Subject: [PATCH] Fix an illegal memory access when copying a PE format file - with corrupt debug information. - - PR 23110 - * peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Check for - a negative PE_DEBUG_DATA size before iterating over the debug data. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-10534 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - bfd/ChangeLog | 6 + - bfd/peXXigen.c | 9 + - bfd/po/bfd.pot | 5631 ++++++++++++++++++++++++++------------------------------ - 3 files changed, 2662 insertions(+), 2984 deletions(-) - -Index: git/bfd/peXXigen.c -=================================================================== ---- git.orig/bfd/peXXigen.c -+++ git/bfd/peXXigen.c -@@ -2991,6 +2991,15 @@ _bfd_XX_bfd_copy_private_bfd_data_common - bfd_get_section_size (section) - (addr - section->vma)); - return FALSE; - } -+ /* PR 23110. */ -+ else if (ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size < 0) -+ { -+ /* xgettext:c-format */ -+ _bfd_error_handler -+ (_("%pB: Data Directory size (%#lx) is negative"), -+ obfd, ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size); -+ return FALSE; -+ } - - for (i = 0; i < ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size - / sizeof (struct external_IMAGE_DEBUG_DIRECTORY); i++) -Index: git/bfd/po/bfd.pot -=================================================================== ---- git.orig/bfd/po/bfd.pot -+++ git/bfd/po/bfd.pot -@@ -18,175 +18,214 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - --#: aout-adobe.c:126 --#, c-format --msgid "%B: Unknown section type in a.out.adobe file: %x\n" --msgstr "" -- - #: aout-cris.c:200 - #, c-format --msgid "%B: Invalid relocation type exported: %d" -+msgid "%pB: unsupported relocation type exported: %#x" - msgstr "" - - #: aout-cris.c:244 - #, c-format --msgid "%B: Invalid relocation type imported: %d" -+msgid "%pB: unsupported relocation type imported: %#x" - msgstr "" - - #: aout-cris.c:256 - #, c-format --msgid "%B: Bad relocation record imported: %d" -+msgid "%pB: bad relocation record imported: %d" - msgstr "" - --#: aoutx.h:1284 aoutx.h:1636 pdp11.c:1152 pdp11.c:1413 -+#: aoutx.h:1264 aoutx.h:1617 pdp11.c:1138 pdp11.c:1399 - #, c-format --msgid "%B: can not represent section `%A' in a.out object file format" -+msgid "%pB: can not represent section `%pA' in a.out object file format" - msgstr "" - --#: aoutx.h:1600 pdp11.c:1385 -+#: aoutx.h:1581 pdp11.c:1371 - #, c-format - msgid "" --"%B: can not represent section for symbol `%s' in a.out object file format" -+"%pB: can not represent section for symbol `%s' in a.out object file format" - msgstr "" - --#: aoutx.h:1603 vms-alpha.c:7853 -+#: aoutx.h:1584 vms-alpha.c:7854 - msgid "*unknown*" - msgstr "" - --#: aoutx.h:2422 aoutx.h:2440 --msgid "%B: attempt to write out unknown reloc type" -+#: aoutx.h:1720 -+#, c-format -+msgid "%pB: invalid string offset %<PRIu64> >= %<PRIu64>" - msgstr "" - --#: aoutx.h:4093 aoutx.h:4414 --msgid "%P: %B: unexpected relocation type\n" -+#: aoutx.h:2411 aoutx.h:2429 -+#, c-format -+msgid "%pB: attempt to write out unknown reloc type" - msgstr "" - --#: aoutx.h:5440 pdp11.c:3708 -+#: aoutx.h:4084 - #, c-format --msgid "%B: relocatable link from %s to %s not supported" -+msgid "%pB: unsupported relocation type" - msgstr "" - --#: archive.c:2305 --msgid "Warning: writing archive was slow: rewriting timestamp\n" -+#. Unknown relocation. -+#: aoutx.h:4405 coff-alpha.c:601 coff-alpha.c:1514 coff-rs6000.c:2773 -+#: coff-sh.c:504 coff-tic4x.c:184 coff-tic54x.c:279 elf-hppa.h:1040 -+#: elf-hppa.h:1068 elf-m10200.c:226 elf-m10300.c:812 elf32-arc.c:519 -+#: elf32-arm.c:1852 elf32-avr.c:959 elf32-bfin.c:1061 elf32-bfin.c:4698 -+#: elf32-cr16.c:653 elf32-cr16.c:683 elf32-cr16c.c:186 elf32-cris.c:467 -+#: elf32-crx.c:429 elf32-d10v.c:234 elf32-d30v.c:522 elf32-d30v.c:544 -+#: elf32-dlx.c:548 elf32-epiphany.c:376 elf32-fr30.c:381 elf32-frv.c:2558 -+#: elf32-frv.c:6262 elf32-ft32.c:306 elf32-h8300.c:302 elf32-i386.c:401 -+#: elf32-ip2k.c:1245 elf32-iq2000.c:442 elf32-lm32.c:539 elf32-m32c.c:305 -+#: elf32-m32r.c:1286 elf32-m32r.c:1311 elf32-m32r.c:2417 elf32-m68hc11.c:390 -+#: elf32-m68hc12.c:510 elf32-m68k.c:352 elf32-mcore.c:354 elf32-mcore.c:440 -+#: elf32-mep.c:389 elf32-metag.c:878 elf32-microblaze.c:692 -+#: elf32-microblaze.c:969 elf32-mips.c:2229 elf32-moxie.c:137 -+#: elf32-msp430.c:648 elf32-msp430.c:658 elf32-mt.c:241 elf32-nds32.c:2880 -+#: elf32-nds32.c:2904 elf32-nds32.c:4423 elf32-nios2.c:3015 elf32-or1k.c:715 -+#: elf32-pj.c:325 elf32-ppc.c:2061 elf32-ppc.c:2074 elf32-pru.c:420 -+#: elf32-rl78.c:292 elf32-rx.c:314 elf32-rx.c:323 elf32-s390.c:347 -+#: elf32-sh.c:438 elf32-spu.c:160 elf32-tic6x.c:1508 elf32-tic6x.c:1518 -+#: elf32-tic6x.c:1537 elf32-tic6x.c:1547 elf32-tic6x.c:2642 elf32-tilepro.c:803 -+#: elf32-v850.c:1899 elf32-v850.c:1921 elf32-v850.c:4270 elf32-vax.c:290 -+#: elf32-visium.c:482 elf32-wasm32.c:106 elf32-xc16x.c:241 elf32-xgate.c:428 -+#: elf32-xstormy16.c:395 elf32-xtensa.c:454 elf32-xtensa.c:488 -+#: elf64-alpha.c:1112 elf64-alpha.c:4101 elf64-alpha.c:4249 -+#: elf64-ia64-vms.c:254 elf64-ia64-vms.c:3440 elf64-mips.c:3623 -+#: elf64-mips.c:3639 elf64-mmix.c:1264 elf64-ppc.c:2281 elf64-ppc.c:2555 -+#: elf64-ppc.c:2564 elf64-s390.c:328 elf64-s390.c:378 elf64-x86-64.c:285 -+#: elfn32-mips.c:3451 elfxx-ia64.c:325 elfxx-riscv.c:955 elfxx-sparc.c:589 -+#: elfxx-sparc.c:639 elfxx-sparc.c:661 elfxx-tilegx.c:912 elfxx-tilegx.c:952 -+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:2126 -+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:2224 elf32-ia64.c:211 -+#: elf32-ia64.c:3863 elf64-ia64.c:211 elf64-ia64.c:3863 -+#, c-format -+msgid "%pB: unsupported relocation type %#x" -+msgstr "" -+ -+#: aoutx.h:5432 pdp11.c:3694 -+#, c-format -+msgid "%pB: relocatable link from %s to %s not supported" -+msgstr "" -+ -+#: archive.c:2216 -+msgid "warning: writing archive was slow: rewriting timestamp" - msgstr "" - --#: archive.c:2421 linker.c:1410 --msgid "%B: plugin needed to handle lto object" -+#: archive.c:2332 linker.c:1416 -+#, c-format -+msgid "%pB: plugin needed to handle lto object" - msgstr "" - --#: archive.c:2650 -+#: archive.c:2561 - msgid "Reading archive file mod timestamp" - msgstr "" - --#: archive.c:2674 -+#: archive.c:2585 - msgid "Writing updated armap timestamp" - msgstr "" - -+#: bfd.c:448 -+msgid "no error" -+msgstr "" -+ -+#: bfd.c:449 -+msgid "system call error" -+msgstr "" -+ -+#: bfd.c:450 -+msgid "invalid bfd target" -+msgstr "" -+ -+#: bfd.c:451 -+msgid "file in wrong format" -+msgstr "" -+ -+#: bfd.c:452 -+msgid "archive object file in wrong format" -+msgstr "" -+ -+#: bfd.c:453 -+msgid "invalid operation" -+msgstr "" -+ - #: bfd.c:454 --msgid "No error" -+msgid "memory exhausted" - msgstr "" - - #: bfd.c:455 --msgid "System call error" -+msgid "no symbols" - msgstr "" - - #: bfd.c:456 --msgid "Invalid bfd target" -+msgid "archive has no index; run ranlib to add one" - msgstr "" - - #: bfd.c:457 --msgid "File in wrong format" -+msgid "no more archived files" - msgstr "" - - #: bfd.c:458 --msgid "Archive object file in wrong format" -+msgid "malformed archive" - msgstr "" - - #: bfd.c:459 --msgid "Invalid operation" -+msgid "DSO missing from command line" - msgstr "" - - #: bfd.c:460 --msgid "Memory exhausted" -+msgid "file format not recognized" - msgstr "" - - #: bfd.c:461 --msgid "No symbols" -+msgid "file format is ambiguous" - msgstr "" - - #: bfd.c:462 --msgid "Archive has no index; run ranlib to add one" -+msgid "section has no contents" - msgstr "" - - #: bfd.c:463 --msgid "No more archived files" -+msgid "nonrepresentable section on output" - msgstr "" - - #: bfd.c:464 --msgid "Malformed archive" -+msgid "symbol needs debug section which does not exist" - msgstr "" - - #: bfd.c:465 --msgid "DSO missing from command line" -+msgid "bad value" - msgstr "" - - #: bfd.c:466 --msgid "File format not recognized" -+msgid "file truncated" - msgstr "" - - #: bfd.c:467 --msgid "File format is ambiguous" -+msgid "file too big" - msgstr "" - - #: bfd.c:468 --msgid "Section has no contents" --msgstr "" -- --#: bfd.c:469 --msgid "Nonrepresentable section on output" --msgstr "" -- --#: bfd.c:470 --msgid "Symbol needs debug section which does not exist" --msgstr "" -- --#: bfd.c:471 --msgid "Bad value" --msgstr "" -- --#: bfd.c:472 --msgid "File truncated" --msgstr "" -- --#: bfd.c:473 --msgid "File too big" --msgstr "" -- --#: bfd.c:474 - #, c-format --msgid "Error reading %s: %s" -+msgid "error reading %s: %s" - msgstr "" - --#: bfd.c:475 --msgid "#<Invalid error code>" -+#: bfd.c:469 -+msgid "#<invalid error code>" - msgstr "" - --#: bfd.c:1442 -+#: bfd.c:1416 - #, c-format - msgid "BFD %s assertion fail %s:%d" - msgstr "" - --#: bfd.c:1455 -+#: bfd.c:1429 - #, c-format - msgid "BFD %s internal error, aborting at %s:%d in %s\n" - msgstr "" - --#: bfd.c:1460 -+#: bfd.c:1434 - #, c-format - msgid "BFD %s internal error, aborting at %s:%d\n" - msgstr "" - --#: bfd.c:1462 -+#: bfd.c:1436 - msgid "Please report this bug.\n" - msgstr "" - -@@ -332,7 +371,7 @@ msgstr "" - msgid "private flags = %x:" - msgstr "" - --#: coff-arm.c:2306 elf32-arm.c:14160 -+#: coff-arm.c:2306 elf32-arm.c:14191 - #, c-format - msgid " [floats passed in float registers]" - msgstr "" -@@ -342,7 +381,7 @@ msgstr "" - msgid " [floats passed in integer registers]" - msgstr "" - --#: coff-arm.c:2311 elf32-arm.c:14163 -+#: coff-arm.c:2311 elf32-arm.c:14194 - #, c-format - msgid " [position independent]" - msgstr "" -@@ -2565,224 +2604,180 @@ msgstr "" - msgid "ip2k relaxer: switch table header corrupt." - msgstr "" - --#: elf32-ip2k.c:1245 --#, c-format --msgid "%B: invalid IP2K reloc number: %d" --msgstr "" -- --#: elf32-ip2k.c:1298 --#, c-format --msgid "ip2k linker: missing page instruction at %#Lx (dest = %#Lx)" --msgstr "" -- --#: elf32-ip2k.c:1315 --#, c-format --msgid "ip2k linker: redundant page instruction at %#Lx (dest = %#Lx)" --msgstr "" -- --#: elf32-iq2000.c:441 -+#: elf32-ip2k.c:1302 - #, c-format --msgid "%B: invalid IQ2000 reloc number: %d" -+msgid "ip2k linker: missing page instruction at %#<PRIx64> (dest = %#<PRIx64>)" - msgstr "" - --#: elf32-lm32.c:539 -+#: elf32-ip2k.c:1321 - #, c-format --msgid "%B: invalid LM32 reloc number: %d" -+msgid "" -+"ip2k linker: redundant page instruction at %#<PRIx64> (dest = %#<PRIx64>)" - msgstr "" - --#: elf32-lm32.c:648 elf32-nios2.c:3133 -+#: elf32-lm32.c:651 elf32-nios2.c:3141 - msgid "global pointer relative relocation when _gp not defined" - msgstr "" - --#: elf32-lm32.c:703 elf32-nios2.c:3570 -+#: elf32-lm32.c:706 elf32-nios2.c:3578 - msgid "global pointer relative address out of range" - msgstr "" - --#: elf32-lm32.c:998 --msgid "internal error: addend should be zero for R_LM32_16_GOT" --msgstr "" -- --#: elf32-m32c.c:306 -+#: elf32-lm32.c:1002 elf32-or1k.c:968 - #, c-format --msgid "%B: invalid M32C reloc number: %d" -+msgid "internal error: addend should be zero for %s" - msgstr "" - --#: elf32-m32r.c:1286 --#, c-format --msgid "%B: invalid M32R reloc number: %d" --msgstr "" -- --#: elf32-m32r.c:1458 -+#: elf32-m32r.c:1471 - msgid "SDA relocation when _SDA_BASE_ not defined" - msgstr "" - --#: elf32-m32r.c:2971 elf32-microblaze.c:1064 elf32-microblaze.c:1112 -+#: elf32-m32r.c:2984 elf32-microblaze.c:1101 elf32-microblaze.c:1149 - #, c-format --msgid "%B: The target (%s) of an %s relocation is in the wrong section (%A)" -+msgid "%pB: the target (%s) of an %s relocation is in the wrong section (%pA)" - msgstr "" - --#: elf32-m32r.c:3473 --msgid "%B: Instruction set mismatch with previous modules" -+#: elf32-m32r.c:3487 -+#, c-format -+msgid "%pB: instruction set mismatch with previous modules" - msgstr "" - --#: elf32-m32r.c:3494 elf32-nds32.c:6037 -+#: elf32-m32r.c:3508 elf32-nds32.c:6010 - #, c-format - msgid "private flags = %lx" - msgstr "" - --#: elf32-m32r.c:3499 -+#: elf32-m32r.c:3513 - #, c-format - msgid ": m32r instructions" - msgstr "" - --#: elf32-m32r.c:3500 -+#: elf32-m32r.c:3514 - #, c-format - msgid ": m32rx instructions" - msgstr "" - --#: elf32-m32r.c:3501 -+#: elf32-m32r.c:3515 - #, c-format - msgid ": m32r2 instructions" - msgstr "" - --#: elf32-m68hc11.c:390 --#, c-format --msgid "%B: invalid M68HC11 reloc number: %d" --msgstr "" -- --#: elf32-m68hc12.c:510 --#, c-format --msgid "%B: invalid M68HC12 reloc number: %d" --msgstr "" -- --#: elf32-m68hc1x.c:1115 -+#: elf32-m68hc1x.c:1116 - #, c-format - msgid "" --"Reference to the far symbol `%s' using a wrong relocation may result in " -+"reference to the far symbol `%s' using a wrong relocation may result in " - "incorrect execution" - msgstr "" - --#: elf32-m68hc1x.c:1149 -+#: elf32-m68hc1x.c:1150 - #, c-format - msgid "" - "XGATE address (%lx) is not within shared RAM(0xE000-0xFFFF), therefore you " - "must manually offset the address, and possibly manage the page, in your code." - msgstr "" - --#: elf32-m68hc1x.c:1167 -+#: elf32-m68hc1x.c:1168 - #, c-format - msgid "" - "banked address [%lx:%04lx] (%lx) is not in the same bank as current banked " - "address [%lx:%04lx] (%lx)" - msgstr "" - --#: elf32-m68hc1x.c:1183 -+#: elf32-m68hc1x.c:1184 - #, c-format - msgid "" - "reference to a banked address [%lx:%04lx] in the normal address space at " - "%04lx" - msgstr "" - --#: elf32-m68hc1x.c:1224 -+#: elf32-m68hc1x.c:1225 - #, c-format - msgid "" - "S12 address (%lx) is not within shared RAM(0x2000-0x4000), therefore you " - "must manually offset the address in your code" - msgstr "" - --#: elf32-m68hc1x.c:1351 -+#: elf32-m68hc1x.c:1352 -+#, c-format - msgid "" --"%B: linking files compiled for 16-bit integers (-mshort) and others for 32-" -+"%pB: linking files compiled for 16-bit integers (-mshort) and others for 32-" - "bit integers" - msgstr "" - --#: elf32-m68hc1x.c:1358 -+#: elf32-m68hc1x.c:1359 -+#, c-format - msgid "" --"%B: linking files compiled for 32-bit double (-fshort-double) and others for " --"64-bit double" -+"%pB: linking files compiled for 32-bit double (-fshort-double) and others " -+"for 64-bit double" - msgstr "" - --#: elf32-m68hc1x.c:1367 --msgid "%B: linking files compiled for HCS12 with others compiled for HC12" -+#: elf32-m68hc1x.c:1368 -+#, c-format -+msgid "%pB: linking files compiled for HCS12 with others compiled for HC12" - msgstr "" - --#: elf32-m68hc1x.c:1412 elf32-xgate.c:672 -+#: elf32-m68hc1x.c:1413 elf32-xgate.c:675 - #, c-format - msgid "[abi=32-bit int, " - msgstr "" - --#: elf32-m68hc1x.c:1414 elf32-xgate.c:674 -+#: elf32-m68hc1x.c:1415 elf32-xgate.c:677 - #, c-format - msgid "[abi=16-bit int, " - msgstr "" - --#: elf32-m68hc1x.c:1417 elf32-xgate.c:677 -+#: elf32-m68hc1x.c:1418 elf32-xgate.c:680 - #, c-format - msgid "64-bit double, " - msgstr "" - --#: elf32-m68hc1x.c:1419 elf32-xgate.c:679 -+#: elf32-m68hc1x.c:1420 elf32-xgate.c:682 - #, c-format - msgid "32-bit double, " - msgstr "" - --#: elf32-m68hc1x.c:1422 -+#: elf32-m68hc1x.c:1423 - #, c-format - msgid "cpu=HC11]" - msgstr "" - --#: elf32-m68hc1x.c:1424 -+#: elf32-m68hc1x.c:1425 - #, c-format - msgid "cpu=HCS12]" - msgstr "" - --#: elf32-m68hc1x.c:1426 -+#: elf32-m68hc1x.c:1427 - #, c-format - msgid "cpu=HC12]" - msgstr "" - --#: elf32-m68hc1x.c:1429 -+#: elf32-m68hc1x.c:1430 - #, c-format - msgid " [memory=bank-model]" - msgstr "" - --#: elf32-m68hc1x.c:1431 -+#: elf32-m68hc1x.c:1432 - #, c-format - msgid " [memory=flat]" - msgstr "" - --#: elf32-m68hc1x.c:1434 -+#: elf32-m68hc1x.c:1435 - #, c-format - msgid " [XGATE RAM offsetting]" - msgstr "" - --#: elf32-m68k.c:1214 elf32-m68k.c:1215 vms-alpha.c:7477 vms-alpha.c:7493 -+#: elf32-m68k.c:1216 elf32-m68k.c:1217 vms-alpha.c:7478 vms-alpha.c:7494 - msgid "unknown" - msgstr "" - --#: elf32-m68k.c:1658 --#, c-format --msgid "%B: GOT overflow: Number of relocations with 8-bit offset > %d" --msgstr "" -- --#: elf32-m68k.c:1665 --#, c-format --msgid "%B: GOT overflow: Number of relocations with 8- or 16-bit offset > %d" --msgstr "" -- --#: elf32-mcore.c:100 elf32-mcore.c:455 -+#: elf32-m68k.c:1660 - #, c-format --msgid "%B: Relocation %s (%d) is not currently supported.\n" -+msgid "%pB: GOT overflow: number of relocations with 8-bit offset > %d" - msgstr "" - --#: elf32-mcore.c:355 -+#: elf32-m68k.c:1667 - #, c-format --msgid "%B: unrecognised MCore reloc number: %d" --msgstr "" -- --#: elf32-mcore.c:440 --#, c-format --msgid "%B: Unknown relocation type %d\n" -+msgid "%pB: GOT overflow: number of relocations with 8- or 16-bit offset > %d" - msgstr "" - - #. Pacify gcc -Wall. -@@ -5936,124 +5931,128 @@ msgstr "" - #. XXX code yet to be written. - #: peicode.h:775 - #, c-format --msgid "%B: Unhandled import type; %x" -+msgid "%pB: unhandled import type; %x" - msgstr "" - - #: peicode.h:781 - #, c-format --msgid "%B: Unrecognised import type; %x" -+msgid "%pB: unrecognized import type; %x" - msgstr "" - - #: peicode.h:796 - #, c-format --msgid "%B: Unrecognised import name type; %x" -+msgid "%pB: unrecognized import name type; %x" - msgstr "" - --#: peicode.h:1217 -+#: peicode.h:1211 - #, c-format --msgid "%B: Unrecognised machine type (0x%x) in Import Library Format archive" -+msgid "%pB: unrecognised machine type (0x%x) in Import Library Format archive" - msgstr "" - --#: peicode.h:1230 -+#: peicode.h:1224 - #, c-format - msgid "" --"%B: Recognised but unhandled machine type (0x%x) in Import Library Format " -+"%pB: recognised but unhandled machine type (0x%x) in Import Library Format " - "archive" - msgstr "" - --#: peicode.h:1248 --msgid "%B: size field is zero in Import Library Format header" -+#: peicode.h:1242 -+#, c-format -+msgid "%pB: size field is zero in Import Library Format header" - msgstr "" - --#: peicode.h:1280 --msgid "%B: string not null terminated in ILF object file." -+#: peicode.h:1274 -+#, c-format -+msgid "%pB: string not null terminated in ILF object file" - msgstr "" - --#: peicode.h:1335 --msgid "%B: Error: Debug Data ends beyond end of debug directory." -+#: peicode.h:1330 -+#, c-format -+msgid "%pB: error: debug data ends beyond end of debug directory" - msgstr "" - --#: ppcboot.c:393 -+#: ppcboot.c:392 - #, c-format - msgid "" - "\n" - "ppcboot header:\n" - msgstr "" - --#: ppcboot.c:394 -+#: ppcboot.c:393 - #, c-format - msgid "Entry offset = 0x%.8lx (%ld)\n" - msgstr "" - --#: ppcboot.c:396 -+#: ppcboot.c:395 - #, c-format - msgid "Length = 0x%.8lx (%ld)\n" - msgstr "" - --#: ppcboot.c:400 -+#: ppcboot.c:399 - #, c-format - msgid "Flag field = 0x%.2x\n" - msgstr "" - --#: ppcboot.c:406 -+#: ppcboot.c:405 - #, c-format - msgid "Partition name = \"%s\"\n" - msgstr "" - --#: ppcboot.c:426 -+#: ppcboot.c:425 - #, c-format - msgid "" - "\n" - "Partition[%d] start = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n" - msgstr "" - --#: ppcboot.c:433 -+#: ppcboot.c:432 - #, c-format - msgid "Partition[%d] end = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n" - msgstr "" - --#: ppcboot.c:440 -+#: ppcboot.c:439 - #, c-format - msgid "Partition[%d] sector = 0x%.8lx (%ld)\n" - msgstr "" - --#: ppcboot.c:444 -+#: ppcboot.c:443 - #, c-format - msgid "Partition[%d] length = 0x%.8lx (%ld)\n" - msgstr "" - --#: reloc.c:8106 --msgid "INPUT_SECTION_FLAGS are not supported.\n" -+#: reloc.c:8125 -+msgid "INPUT_SECTION_FLAGS are not supported" - msgstr "" - --#: reloc.c:8207 -+#: reloc.c:8226 - #, c-format --msgid "%X%P: %B(%A): error: relocation for offset %V has no value\n" -+msgid "%X%P: %pB(%pA): error: relocation for offset %V has no value\n" - msgstr "" - --#: reloc.c:8283 -+#: reloc.c:8302 - #, c-format --msgid "%X%P: %B(%A): relocation \"%R\" is not supported\n" -+msgid "%X%P: %pB(%pA): relocation \"%pR\" is not supported\n" - msgstr "" - --#: reloc.c:8292 -+#: reloc.c:8311 - #, c-format --msgid "%X%P: %B(%A): relocation \"%R\" returns an unrecognized value %x\n" -+msgid "%X%P: %pB(%pA): relocation \"%pR\" returns an unrecognized value %x\n" - msgstr "" - --#: reloc.c:8354 -+#: reloc.c:8373 - #, c-format --msgid "%B: unrecognized relocation (%#x) in section `%A'" -+msgid "%pB: unrecognized relocation type %#x in section `%pA'" - msgstr "" - - #. PR 21803: Suggest the most likely cause of this error. --#: reloc.c:8358 -+#: reloc.c:8377 - #, c-format --msgid "Is this version of the linker - %s - out of date ?" -+msgid "is this version of the linker - %s - out of date ?" - msgstr "" - - #: rs6000-core.c:471 --msgid "%B: warning core file truncated" -+#, c-format -+msgid "%pB: warning core file truncated" - msgstr "" - - #: som.c:5478 -@@ -6069,91 +6068,91 @@ msgstr "" - - #: srec.c:260 - #, c-format --msgid "%B:%d: Unexpected character `%s' in S-record file\n" -+msgid "%pB:%d: unexpected character `%s' in S-record file" - msgstr "" - - #: srec.c:488 - #, c-format --msgid "%B:%d: byte count %d too small\n" -+msgid "%pB:%d: byte count %d too small" - msgstr "" - - #: srec.c:581 srec.c:615 - #, c-format --msgid "%B:%d: Bad checksum in S-record file\n" -+msgid "%pB:%d: bad checksum in S-record file" - msgstr "" - - #: stabs.c:279 - #, c-format --msgid "%B(%A+%#lx): Stabs entry has invalid string index." -+msgid "%pB(%pA+%#lx): stabs entry has invalid string index" - msgstr "" - - #: syms.c:1079 --msgid "Unsupported .stab relocation" -+msgid "unsupported .stab relocation" - msgstr "" - - #: vms-alpha.c:479 --msgid "Corrupt EIHD record - size is too small" -+msgid "corrupt EIHD record - size is too small" - msgstr "" - - #: vms-alpha.c:660 - #, c-format --msgid "Unable to read EIHS record at offset %#x" -+msgid "unable to read EIHS record at offset %#x" - msgstr "" - --#: vms-alpha.c:1172 -+#: vms-alpha.c:1173 - #, c-format --msgid "Corrupt EGSD record: its size (%#x) is too small" -+msgid "corrupt EGSD record: its size (%#x) is too small" - msgstr "" - --#: vms-alpha.c:1196 -+#: vms-alpha.c:1197 - #, c-format --msgid "Corrupt EGSD record: size (%#x) is larger than remaining space (%#x)" -+msgid "corrupt EGSD record: size (%#x) is larger than remaining space (%#x)" - msgstr "" - --#: vms-alpha.c:1204 -+#: vms-alpha.c:1205 - #, c-format --msgid "Corrupt EGSD record: size (%#x) is too small" -+msgid "corrupt EGSD record: size (%#x) is too small" - msgstr "" - --#: vms-alpha.c:1333 vms-alpha.c:1349 vms-alpha.c:1389 -+#: vms-alpha.c:1334 vms-alpha.c:1350 vms-alpha.c:1390 - #, c-format --msgid "Corrupt EGSD record: its psindx field is too big (%#lx)" -+msgid "corrupt EGSD record: its psindx field is too big (%#lx)" - msgstr "" - --#: vms-alpha.c:1418 -+#: vms-alpha.c:1419 - #, c-format --msgid "Unknown EGSD subtype %d" -+msgid "unknown EGSD subtype %d" - msgstr "" - --#: vms-alpha.c:1451 -+#: vms-alpha.c:1452 - #, c-format --msgid "Stack overflow (%d) in _bfd_vms_push" -+msgid "stack overflow (%d) in _bfd_vms_push" - msgstr "" - --#: vms-alpha.c:1464 --msgid "Stack underflow in _bfd_vms_pop" -+#: vms-alpha.c:1465 -+msgid "stack underflow in _bfd_vms_pop" - msgstr "" - - #. These names have not yet been added to this switch statement. --#: vms-alpha.c:1706 -+#: vms-alpha.c:1707 - #, c-format - msgid "unknown ETIR command %d" - msgstr "" - --#: vms-alpha.c:1737 --msgid "Corrupt vms value" -+#: vms-alpha.c:1738 -+msgid "corrupt vms value" - msgstr "" - --#: vms-alpha.c:1865 --msgid "Corrupt ETIR record encountered" -+#: vms-alpha.c:1866 -+msgid "corrupt ETIR record encountered" - msgstr "" - --#: vms-alpha.c:1922 -+#: vms-alpha.c:1923 - #, c-format - msgid "bad section index in %s" - msgstr "" - --#: vms-alpha.c:1935 -+#: vms-alpha.c:1936 - #, c-format - msgid "unsupported STA cmd %s" - msgstr "" -@@ -6163,1961 +6162,1932 @@ msgstr "" - #. Rotate. - #. Redefine symbol to current location. - #. Define a literal. --#: vms-alpha.c:2115 vms-alpha.c:2146 vms-alpha.c:2237 vms-alpha.c:2395 -+#: vms-alpha.c:2116 vms-alpha.c:2147 vms-alpha.c:2238 vms-alpha.c:2396 - #, c-format - msgid "%s: not supported" - msgstr "" - --#: vms-alpha.c:2121 -+#: vms-alpha.c:2122 - #, c-format - msgid "%s: not implemented" - msgstr "" - --#: vms-alpha.c:2379 -+#: vms-alpha.c:2380 - #, c-format - msgid "invalid use of %s with contexts" - msgstr "" - --#: vms-alpha.c:2413 -+#: vms-alpha.c:2414 - #, c-format - msgid "reserved cmd %d" - msgstr "" - --#: vms-alpha.c:2497 --msgid "Corrupt EEOM record - size is too small" -+#: vms-alpha.c:2498 -+msgid "corrupt EEOM record - size is too small" - msgstr "" - --#: vms-alpha.c:2506 --msgid "Object module NOT error-free !\n" -+#: vms-alpha.c:2507 -+msgid "object module not error-free !" - msgstr "" - --#: vms-alpha.c:3830 -+#: vms-alpha.c:3831 - #, c-format --msgid "SEC_RELOC with no relocs in section %A" -+msgid "SEC_RELOC with no relocs in section %pA" - msgstr "" - --#: vms-alpha.c:3882 vms-alpha.c:4095 -+#: vms-alpha.c:3883 vms-alpha.c:4096 - #, c-format --msgid "Size error in section %A" -+msgid "size error in section %pA" - msgstr "" - --#: vms-alpha.c:4041 --msgid "Spurious ALPHA_R_BSR reloc" -+#: vms-alpha.c:4042 -+msgid "spurious ALPHA_R_BSR reloc" - msgstr "" - --#: vms-alpha.c:4082 -+#: vms-alpha.c:4083 - #, c-format --msgid "Unhandled relocation %s" -+msgid "unhandled relocation %s" - msgstr "" - --#: vms-alpha.c:4375 -+#: vms-alpha.c:4376 - #, c-format - msgid "unknown source command %d" - msgstr "" - --#: vms-alpha.c:4436 --msgid "DST__K_SET_LINUM_INCR not implemented" --msgstr "" -- --#: vms-alpha.c:4442 --msgid "DST__K_SET_LINUM_INCR_W not implemented" --msgstr "" -- --#: vms-alpha.c:4448 --msgid "DST__K_RESET_LINUM_INCR not implemented" --msgstr "" -- --#: vms-alpha.c:4454 --msgid "DST__K_BEG_STMT_MODE not implemented" --msgstr "" -- --#: vms-alpha.c:4460 --msgid "DST__K_END_STMT_MODE not implemented" --msgstr "" -- --#: vms-alpha.c:4487 --msgid "DST__K_SET_PC not implemented" --msgstr "" -- --#: vms-alpha.c:4493 --msgid "DST__K_SET_PC_W not implemented" --msgstr "" -- --#: vms-alpha.c:4499 --msgid "DST__K_SET_PC_L not implemented" --msgstr "" -- --#: vms-alpha.c:4505 --msgid "DST__K_SET_STMTNUM not implemented" -+#: vms-alpha.c:4437 vms-alpha.c:4443 vms-alpha.c:4449 vms-alpha.c:4455 -+#: vms-alpha.c:4461 vms-alpha.c:4488 vms-alpha.c:4494 vms-alpha.c:4500 -+#: vms-alpha.c:4506 -+#, c-format -+msgid "%s not implemented" - msgstr "" - --#: vms-alpha.c:4548 -+#: vms-alpha.c:4549 - #, c-format - msgid "unknown line command %d" - msgstr "" - --#: vms-alpha.c:5008 vms-alpha.c:5026 vms-alpha.c:5041 vms-alpha.c:5057 --#: vms-alpha.c:5070 vms-alpha.c:5082 vms-alpha.c:5095 -+#: vms-alpha.c:5009 vms-alpha.c:5027 vms-alpha.c:5042 vms-alpha.c:5058 -+#: vms-alpha.c:5071 vms-alpha.c:5083 vms-alpha.c:5096 - #, c-format --msgid "Unknown reloc %s + %s" -+msgid "unknown reloc %s + %s" - msgstr "" - --#: vms-alpha.c:5150 -+#: vms-alpha.c:5151 - #, c-format --msgid "Unknown reloc %s" -+msgid "unknown reloc %s" - msgstr "" - --#: vms-alpha.c:5163 --msgid "Invalid section index in ETIR" -+#: vms-alpha.c:5164 -+msgid "invalid section index in ETIR" - msgstr "" - --#: vms-alpha.c:5172 --msgid "Relocation for non-REL psect" -+#: vms-alpha.c:5173 -+msgid "relocation for non-REL psect" - msgstr "" - --#: vms-alpha.c:5219 -+#: vms-alpha.c:5220 - #, c-format --msgid "Unknown symbol in command %s" -+msgid "unknown symbol in command %s" - msgstr "" - --#: vms-alpha.c:5629 -+#: vms-alpha.c:5630 - #, c-format - msgid "reloc (%d) is *UNKNOWN*" - msgstr "" - --#: vms-alpha.c:5745 -+#: vms-alpha.c:5746 - #, c-format - msgid " EMH %u (len=%u): " - msgstr "" - --#: vms-alpha.c:5750 -+#: vms-alpha.c:5751 - #, c-format - msgid " Error: The length is less than the length of an EMH record\n" - msgstr "" - --#: vms-alpha.c:5767 -+#: vms-alpha.c:5768 - #, c-format - msgid "" - " Error: The record length is less than the size of an EMH_MHD record\n" - msgstr "" - --#: vms-alpha.c:5770 -+#: vms-alpha.c:5771 - #, c-format - msgid "Module header\n" - msgstr "" - --#: vms-alpha.c:5771 -+#: vms-alpha.c:5772 - #, c-format - msgid " structure level: %u\n" - msgstr "" - --#: vms-alpha.c:5772 -+#: vms-alpha.c:5773 - #, c-format - msgid " max record size: %u\n" - msgstr "" - --#: vms-alpha.c:5778 -+#: vms-alpha.c:5779 - #, c-format - msgid " Error: The module name is missing\n" - msgstr "" - --#: vms-alpha.c:5784 -+#: vms-alpha.c:5785 - #, c-format - msgid " Error: The module name is too long\n" - msgstr "" - --#: vms-alpha.c:5787 -+#: vms-alpha.c:5788 - #, c-format - msgid " module name : %.*s\n" - msgstr "" - --#: vms-alpha.c:5791 -+#: vms-alpha.c:5792 - #, c-format - msgid " Error: The module version is missing\n" - msgstr "" - --#: vms-alpha.c:5797 -+#: vms-alpha.c:5798 - #, c-format - msgid " Error: The module version is too long\n" - msgstr "" - --#: vms-alpha.c:5800 -+#: vms-alpha.c:5801 - #, c-format - msgid " module version : %.*s\n" - msgstr "" - --#: vms-alpha.c:5803 -+#: vms-alpha.c:5804 - #, c-format - msgid " Error: The compile date is truncated\n" - msgstr "" - --#: vms-alpha.c:5805 -+#: vms-alpha.c:5806 - #, c-format - msgid " compile date : %.17s\n" - msgstr "" - --#: vms-alpha.c:5810 -+#: vms-alpha.c:5811 - #, c-format - msgid "Language Processor Name\n" - msgstr "" - --#: vms-alpha.c:5811 -+#: vms-alpha.c:5812 - #, c-format - msgid " language name: %.*s\n" - msgstr "" - --#: vms-alpha.c:5815 -+#: vms-alpha.c:5816 - #, c-format - msgid "Source Files Header\n" - msgstr "" - --#: vms-alpha.c:5816 -+#: vms-alpha.c:5817 - #, c-format - msgid " file: %.*s\n" - msgstr "" - --#: vms-alpha.c:5820 -+#: vms-alpha.c:5821 - #, c-format - msgid "Title Text Header\n" - msgstr "" - --#: vms-alpha.c:5821 -+#: vms-alpha.c:5822 - #, c-format - msgid " title: %.*s\n" - msgstr "" - --#: vms-alpha.c:5825 -+#: vms-alpha.c:5826 - #, c-format - msgid "Copyright Header\n" - msgstr "" - --#: vms-alpha.c:5826 -+#: vms-alpha.c:5827 - #, c-format - msgid " copyright: %.*s\n" - msgstr "" - --#: vms-alpha.c:5830 -+#: vms-alpha.c:5831 - #, c-format - msgid "unhandled emh subtype %u\n" - msgstr "" - --#: vms-alpha.c:5840 -+#: vms-alpha.c:5841 - #, c-format - msgid " EEOM (len=%u):\n" - msgstr "" - --#: vms-alpha.c:5845 -+#: vms-alpha.c:5846 - #, c-format - msgid " Error: The length is less than the length of an EEOM record\n" - msgstr "" - --#: vms-alpha.c:5849 -+#: vms-alpha.c:5850 - #, c-format - msgid " number of cond linkage pairs: %u\n" - msgstr "" - --#: vms-alpha.c:5851 -+#: vms-alpha.c:5852 - #, c-format - msgid " completion code: %u\n" - msgstr "" - --#: vms-alpha.c:5855 -+#: vms-alpha.c:5856 - #, c-format - msgid " transfer addr flags: 0x%02x\n" - msgstr "" - --#: vms-alpha.c:5856 -+#: vms-alpha.c:5857 - #, c-format - msgid " transfer addr psect: %u\n" - msgstr "" - --#: vms-alpha.c:5858 -+#: vms-alpha.c:5859 - #, c-format - msgid " transfer address : 0x%08x\n" - msgstr "" - --#: vms-alpha.c:5867 -+#: vms-alpha.c:5868 - msgid " WEAK" - msgstr "" - --#: vms-alpha.c:5869 -+#: vms-alpha.c:5870 - msgid " DEF" - msgstr "" - --#: vms-alpha.c:5871 -+#: vms-alpha.c:5872 - msgid " UNI" - msgstr "" - --#: vms-alpha.c:5873 vms-alpha.c:5894 -+#: vms-alpha.c:5874 vms-alpha.c:5895 - msgid " REL" - msgstr "" - --#: vms-alpha.c:5875 -+#: vms-alpha.c:5876 - msgid " COMM" - msgstr "" - --#: vms-alpha.c:5877 -+#: vms-alpha.c:5878 - msgid " VECEP" - msgstr "" - --#: vms-alpha.c:5879 -+#: vms-alpha.c:5880 - msgid " NORM" - msgstr "" - --#: vms-alpha.c:5881 -+#: vms-alpha.c:5882 - msgid " QVAL" - msgstr "" - --#: vms-alpha.c:5888 -+#: vms-alpha.c:5889 - msgid " PIC" - msgstr "" - --#: vms-alpha.c:5890 -+#: vms-alpha.c:5891 - msgid " LIB" - msgstr "" - --#: vms-alpha.c:5892 -+#: vms-alpha.c:5893 - msgid " OVR" - msgstr "" - --#: vms-alpha.c:5896 -+#: vms-alpha.c:5897 - msgid " GBL" - msgstr "" - --#: vms-alpha.c:5898 -+#: vms-alpha.c:5899 - msgid " SHR" - msgstr "" - --#: vms-alpha.c:5900 -+#: vms-alpha.c:5901 - msgid " EXE" - msgstr "" - --#: vms-alpha.c:5902 -+#: vms-alpha.c:5903 - msgid " RD" - msgstr "" - --#: vms-alpha.c:5904 -+#: vms-alpha.c:5905 - msgid " WRT" - msgstr "" - --#: vms-alpha.c:5906 -+#: vms-alpha.c:5907 - msgid " VEC" - msgstr "" - --#: vms-alpha.c:5908 -+#: vms-alpha.c:5909 - msgid " NOMOD" - msgstr "" - --#: vms-alpha.c:5910 -+#: vms-alpha.c:5911 - msgid " COM" - msgstr "" - --#: vms-alpha.c:5912 -+#: vms-alpha.c:5913 - msgid " 64B" - msgstr "" - --#: vms-alpha.c:5921 -+#: vms-alpha.c:5922 - #, c-format - msgid " EGSD (len=%u):\n" - msgstr "" - --#: vms-alpha.c:5934 -+#: vms-alpha.c:5935 - #, c-format - msgid " EGSD entry %2u (type: %u, len: %u): " - msgstr "" - --#: vms-alpha.c:5940 vms-alpha.c:6191 -+#: vms-alpha.c:5941 vms-alpha.c:6192 - #, c-format - msgid " Error: length larger than remaining space in record\n" - msgstr "" - --#: vms-alpha.c:5952 -+#: vms-alpha.c:5953 - #, c-format - msgid "PSC - Program section definition\n" - msgstr "" - --#: vms-alpha.c:5953 vms-alpha.c:5970 -+#: vms-alpha.c:5954 vms-alpha.c:5971 - #, c-format - msgid " alignment : 2**%u\n" - msgstr "" - --#: vms-alpha.c:5954 vms-alpha.c:5971 -+#: vms-alpha.c:5955 vms-alpha.c:5972 - #, c-format - msgid " flags : 0x%04x" - msgstr "" - --#: vms-alpha.c:5958 -+#: vms-alpha.c:5959 - #, c-format - msgid " alloc (len): %u (0x%08x)\n" - msgstr "" - --#: vms-alpha.c:5959 vms-alpha.c:6016 vms-alpha.c:6065 -+#: vms-alpha.c:5960 vms-alpha.c:6017 vms-alpha.c:6066 - #, c-format - msgid " name : %.*s\n" - msgstr "" - --#: vms-alpha.c:5969 -+#: vms-alpha.c:5970 - #, c-format - msgid "SPSC - Shared Image Program section def\n" - msgstr "" - --#: vms-alpha.c:5975 -+#: vms-alpha.c:5976 - #, c-format - msgid " alloc (len) : %u (0x%08x)\n" - msgstr "" - --#: vms-alpha.c:5976 -+#: vms-alpha.c:5977 - #, c-format - msgid " image offset : 0x%08x\n" - msgstr "" - --#: vms-alpha.c:5978 -+#: vms-alpha.c:5979 - #, c-format - msgid " symvec offset : 0x%08x\n" - msgstr "" - --#: vms-alpha.c:5980 -+#: vms-alpha.c:5981 - #, c-format - msgid " name : %.*s\n" - msgstr "" - --#: vms-alpha.c:5993 -+#: vms-alpha.c:5994 - #, c-format - msgid "SYM - Global symbol definition\n" - msgstr "" - --#: vms-alpha.c:5994 vms-alpha.c:6054 vms-alpha.c:6075 vms-alpha.c:6094 -+#: vms-alpha.c:5995 vms-alpha.c:6055 vms-alpha.c:6076 vms-alpha.c:6095 - #, c-format - msgid " flags: 0x%04x" - msgstr "" - --#: vms-alpha.c:5997 -+#: vms-alpha.c:5998 - #, c-format - msgid " psect offset: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6001 -+#: vms-alpha.c:6002 - #, c-format - msgid " code address: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6003 -+#: vms-alpha.c:6004 - #, c-format - msgid " psect index for entry point : %u\n" - msgstr "" - --#: vms-alpha.c:6006 vms-alpha.c:6082 vms-alpha.c:6101 -+#: vms-alpha.c:6007 vms-alpha.c:6083 vms-alpha.c:6102 - #, c-format - msgid " psect index : %u\n" - msgstr "" - --#: vms-alpha.c:6008 vms-alpha.c:6084 vms-alpha.c:6103 -+#: vms-alpha.c:6009 vms-alpha.c:6085 vms-alpha.c:6104 - #, c-format - msgid " name : %.*s\n" - msgstr "" - --#: vms-alpha.c:6015 -+#: vms-alpha.c:6016 - #, c-format - msgid "SYM - Global symbol reference\n" - msgstr "" - --#: vms-alpha.c:6027 -+#: vms-alpha.c:6028 - #, c-format - msgid "IDC - Ident Consistency check\n" - msgstr "" - --#: vms-alpha.c:6028 -+#: vms-alpha.c:6029 - #, c-format - msgid " flags : 0x%08x" - msgstr "" - --#: vms-alpha.c:6032 -+#: vms-alpha.c:6033 - #, c-format - msgid " id match : %x\n" - msgstr "" - --#: vms-alpha.c:6034 -+#: vms-alpha.c:6035 - #, c-format - msgid " error severity: %x\n" - msgstr "" - --#: vms-alpha.c:6037 -+#: vms-alpha.c:6038 - #, c-format - msgid " entity name : %.*s\n" - msgstr "" - --#: vms-alpha.c:6039 -+#: vms-alpha.c:6040 - #, c-format - msgid " object name : %.*s\n" - msgstr "" - --#: vms-alpha.c:6042 -+#: vms-alpha.c:6043 - #, c-format - msgid " binary ident : 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6045 -+#: vms-alpha.c:6046 - #, c-format - msgid " ascii ident : %.*s\n" - msgstr "" - --#: vms-alpha.c:6053 -+#: vms-alpha.c:6054 - #, c-format - msgid "SYMG - Universal symbol definition\n" - msgstr "" - --#: vms-alpha.c:6057 -+#: vms-alpha.c:6058 - #, c-format - msgid " symbol vector offset: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6059 -+#: vms-alpha.c:6060 - #, c-format - msgid " entry point: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6061 -+#: vms-alpha.c:6062 - #, c-format - msgid " proc descr : 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6063 -+#: vms-alpha.c:6064 - #, c-format - msgid " psect index: %u\n" - msgstr "" - --#: vms-alpha.c:6074 -+#: vms-alpha.c:6075 - #, c-format - msgid "SYMV - Vectored symbol definition\n" - msgstr "" - --#: vms-alpha.c:6078 -+#: vms-alpha.c:6079 - #, c-format - msgid " vector : 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6080 vms-alpha.c:6099 -+#: vms-alpha.c:6081 vms-alpha.c:6100 - #, c-format - msgid " psect offset: %u\n" - msgstr "" - --#: vms-alpha.c:6093 -+#: vms-alpha.c:6094 - #, c-format - msgid "SYMM - Global symbol definition with version\n" - msgstr "" - --#: vms-alpha.c:6097 -+#: vms-alpha.c:6098 - #, c-format - msgid " version mask: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6108 -+#: vms-alpha.c:6109 - #, c-format - msgid "unhandled egsd entry type %u\n" - msgstr "" - --#: vms-alpha.c:6143 -+#: vms-alpha.c:6144 - #, c-format - msgid " linkage index: %u, replacement insn: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6147 -+#: vms-alpha.c:6148 - #, c-format - msgid " psect idx 1: %u, offset 1: 0x%08x %08x\n" - msgstr "" - --#: vms-alpha.c:6152 -+#: vms-alpha.c:6153 - #, c-format - msgid " psect idx 2: %u, offset 2: 0x%08x %08x\n" - msgstr "" - --#: vms-alpha.c:6158 -+#: vms-alpha.c:6159 - #, c-format - msgid " psect idx 3: %u, offset 3: 0x%08x %08x\n" - msgstr "" - --#: vms-alpha.c:6163 -+#: vms-alpha.c:6164 - #, c-format - msgid " global name: %.*s\n" - msgstr "" - --#: vms-alpha.c:6174 -+#: vms-alpha.c:6175 - #, c-format - msgid " %s (len=%u+%u):\n" - msgstr "" - --#: vms-alpha.c:6196 -+#: vms-alpha.c:6197 - #, c-format - msgid " (type: %3u, size: 4+%3u): " - msgstr "" - --#: vms-alpha.c:6200 -+#: vms-alpha.c:6201 - #, c-format - msgid "STA_GBL (stack global) %.*s\n" - msgstr "" - --#: vms-alpha.c:6204 -+#: vms-alpha.c:6205 - #, c-format - msgid "STA_LW (stack longword) 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6208 -+#: vms-alpha.c:6209 - #, c-format - msgid "STA_QW (stack quadword) 0x%08x %08x\n" - msgstr "" - --#: vms-alpha.c:6213 -+#: vms-alpha.c:6214 - #, c-format - msgid "STA_PQ (stack psect base + offset)\n" - msgstr "" - --#: vms-alpha.c:6215 -+#: vms-alpha.c:6216 - #, c-format - msgid " psect: %u, offset: 0x%08x %08x\n" - msgstr "" - --#: vms-alpha.c:6221 -+#: vms-alpha.c:6222 - #, c-format - msgid "STA_LI (stack literal)\n" - msgstr "" - --#: vms-alpha.c:6224 -+#: vms-alpha.c:6225 - #, c-format - msgid "STA_MOD (stack module)\n" - msgstr "" - --#: vms-alpha.c:6227 -+#: vms-alpha.c:6228 - #, c-format - msgid "STA_CKARG (compare procedure argument)\n" - msgstr "" - --#: vms-alpha.c:6231 -+#: vms-alpha.c:6232 - #, c-format - msgid "STO_B (store byte)\n" - msgstr "" - --#: vms-alpha.c:6234 -+#: vms-alpha.c:6235 - #, c-format - msgid "STO_W (store word)\n" - msgstr "" - --#: vms-alpha.c:6237 -+#: vms-alpha.c:6238 - #, c-format - msgid "STO_LW (store longword)\n" - msgstr "" - --#: vms-alpha.c:6240 -+#: vms-alpha.c:6241 - #, c-format - msgid "STO_QW (store quadword)\n" - msgstr "" - --#: vms-alpha.c:6246 -+#: vms-alpha.c:6247 - #, c-format - msgid "STO_IMMR (store immediate repeat) %u bytes\n" - msgstr "" - --#: vms-alpha.c:6253 -+#: vms-alpha.c:6254 - #, c-format - msgid "STO_GBL (store global) %.*s\n" - msgstr "" - --#: vms-alpha.c:6257 -+#: vms-alpha.c:6258 - #, c-format - msgid "STO_CA (store code address) %.*s\n" - msgstr "" - --#: vms-alpha.c:6261 -+#: vms-alpha.c:6262 - #, c-format - msgid "STO_RB (store relative branch)\n" - msgstr "" - --#: vms-alpha.c:6264 -+#: vms-alpha.c:6265 - #, c-format - msgid "STO_AB (store absolute branch)\n" - msgstr "" - --#: vms-alpha.c:6267 -+#: vms-alpha.c:6268 - #, c-format - msgid "STO_OFF (store offset to psect)\n" - msgstr "" - --#: vms-alpha.c:6273 -+#: vms-alpha.c:6274 - #, c-format - msgid "STO_IMM (store immediate) %u bytes\n" - msgstr "" - --#: vms-alpha.c:6280 -+#: vms-alpha.c:6281 - #, c-format - msgid "STO_GBL_LW (store global longword) %.*s\n" - msgstr "" - --#: vms-alpha.c:6284 -+#: vms-alpha.c:6285 - #, c-format - msgid "STO_OFF (store LP with procedure signature)\n" - msgstr "" - --#: vms-alpha.c:6287 -+#: vms-alpha.c:6288 - #, c-format - msgid "STO_BR_GBL (store branch global) *todo*\n" - msgstr "" - --#: vms-alpha.c:6290 -+#: vms-alpha.c:6291 - #, c-format - msgid "STO_BR_PS (store branch psect + offset) *todo*\n" - msgstr "" - --#: vms-alpha.c:6294 -+#: vms-alpha.c:6295 - #, c-format - msgid "OPR_NOP (no-operation)\n" - msgstr "" - --#: vms-alpha.c:6297 -+#: vms-alpha.c:6298 - #, c-format - msgid "OPR_ADD (add)\n" - msgstr "" - --#: vms-alpha.c:6300 -+#: vms-alpha.c:6301 - #, c-format - msgid "OPR_SUB (subtract)\n" - msgstr "" - --#: vms-alpha.c:6303 -+#: vms-alpha.c:6304 - #, c-format - msgid "OPR_MUL (multiply)\n" - msgstr "" - --#: vms-alpha.c:6306 -+#: vms-alpha.c:6307 - #, c-format - msgid "OPR_DIV (divide)\n" - msgstr "" - --#: vms-alpha.c:6309 -+#: vms-alpha.c:6310 - #, c-format - msgid "OPR_AND (logical and)\n" - msgstr "" - --#: vms-alpha.c:6312 -+#: vms-alpha.c:6313 - #, c-format - msgid "OPR_IOR (logical inclusive or)\n" - msgstr "" - --#: vms-alpha.c:6315 -+#: vms-alpha.c:6316 - #, c-format - msgid "OPR_EOR (logical exclusive or)\n" - msgstr "" - --#: vms-alpha.c:6318 -+#: vms-alpha.c:6319 - #, c-format - msgid "OPR_NEG (negate)\n" - msgstr "" - --#: vms-alpha.c:6321 -+#: vms-alpha.c:6322 - #, c-format - msgid "OPR_COM (complement)\n" - msgstr "" - --#: vms-alpha.c:6324 -+#: vms-alpha.c:6325 - #, c-format - msgid "OPR_INSV (insert field)\n" - msgstr "" - --#: vms-alpha.c:6327 -+#: vms-alpha.c:6328 - #, c-format - msgid "OPR_ASH (arithmetic shift)\n" - msgstr "" - --#: vms-alpha.c:6330 -+#: vms-alpha.c:6331 - #, c-format - msgid "OPR_USH (unsigned shift)\n" - msgstr "" - --#: vms-alpha.c:6333 -+#: vms-alpha.c:6334 - #, c-format - msgid "OPR_ROT (rotate)\n" - msgstr "" - --#: vms-alpha.c:6336 -+#: vms-alpha.c:6337 - #, c-format - msgid "OPR_SEL (select)\n" - msgstr "" - --#: vms-alpha.c:6339 -+#: vms-alpha.c:6340 - #, c-format - msgid "OPR_REDEF (redefine symbol to curr location)\n" - msgstr "" - --#: vms-alpha.c:6342 -+#: vms-alpha.c:6343 - #, c-format - msgid "OPR_REDEF (define a literal)\n" - msgstr "" - --#: vms-alpha.c:6346 -+#: vms-alpha.c:6347 - #, c-format - msgid "STC_LP (store cond linkage pair)\n" - msgstr "" - --#: vms-alpha.c:6350 -+#: vms-alpha.c:6351 - #, c-format - msgid "STC_LP_PSB (store cond linkage pair + signature)\n" - msgstr "" - --#: vms-alpha.c:6352 -+#: vms-alpha.c:6353 - #, c-format - msgid " linkage index: %u, procedure: %.*s\n" - msgstr "" - --#: vms-alpha.c:6355 -+#: vms-alpha.c:6356 - #, c-format - msgid " signature: %.*s\n" - msgstr "" - --#: vms-alpha.c:6358 -+#: vms-alpha.c:6359 - #, c-format - msgid "STC_GBL (store cond global)\n" - msgstr "" - --#: vms-alpha.c:6360 -+#: vms-alpha.c:6361 - #, c-format - msgid " linkage index: %u, global: %.*s\n" - msgstr "" - --#: vms-alpha.c:6364 -+#: vms-alpha.c:6365 - #, c-format - msgid "STC_GCA (store cond code address)\n" - msgstr "" - --#: vms-alpha.c:6366 -+#: vms-alpha.c:6367 - #, c-format - msgid " linkage index: %u, procedure name: %.*s\n" - msgstr "" - --#: vms-alpha.c:6370 -+#: vms-alpha.c:6371 - #, c-format - msgid "STC_PS (store cond psect + offset)\n" - msgstr "" - --#: vms-alpha.c:6373 -+#: vms-alpha.c:6374 - #, c-format - msgid " linkage index: %u, psect: %u, offset: 0x%08x %08x\n" - msgstr "" - --#: vms-alpha.c:6380 -+#: vms-alpha.c:6381 - #, c-format - msgid "STC_NOP_GBL (store cond NOP at global addr)\n" - msgstr "" - --#: vms-alpha.c:6384 -+#: vms-alpha.c:6385 - #, c-format - msgid "STC_NOP_PS (store cond NOP at psect + offset)\n" - msgstr "" - --#: vms-alpha.c:6388 -+#: vms-alpha.c:6389 - #, c-format - msgid "STC_BSR_GBL (store cond BSR at global addr)\n" - msgstr "" - --#: vms-alpha.c:6392 -+#: vms-alpha.c:6393 - #, c-format - msgid "STC_BSR_PS (store cond BSR at psect + offset)\n" - msgstr "" - --#: vms-alpha.c:6396 -+#: vms-alpha.c:6397 - #, c-format - msgid "STC_LDA_GBL (store cond LDA at global addr)\n" - msgstr "" - --#: vms-alpha.c:6400 -+#: vms-alpha.c:6401 - #, c-format - msgid "STC_LDA_PS (store cond LDA at psect + offset)\n" - msgstr "" - --#: vms-alpha.c:6404 -+#: vms-alpha.c:6405 - #, c-format - msgid "STC_BOH_GBL (store cond BOH at global addr)\n" - msgstr "" - --#: vms-alpha.c:6408 -+#: vms-alpha.c:6409 - #, c-format - msgid "STC_BOH_PS (store cond BOH at psect + offset)\n" - msgstr "" - --#: vms-alpha.c:6413 -+#: vms-alpha.c:6414 - #, c-format - msgid "STC_NBH_GBL (store cond or hint at global addr)\n" - msgstr "" - --#: vms-alpha.c:6417 -+#: vms-alpha.c:6418 - #, c-format - msgid "STC_NBH_PS (store cond or hint at psect + offset)\n" - msgstr "" - --#: vms-alpha.c:6421 -+#: vms-alpha.c:6422 - #, c-format - msgid "CTL_SETRB (set relocation base)\n" - msgstr "" - --#: vms-alpha.c:6427 -+#: vms-alpha.c:6428 - #, c-format - msgid "CTL_AUGRB (augment relocation base) %u\n" - msgstr "" - --#: vms-alpha.c:6431 -+#: vms-alpha.c:6432 - #, c-format - msgid "CTL_DFLOC (define location)\n" - msgstr "" - --#: vms-alpha.c:6434 -+#: vms-alpha.c:6435 - #, c-format - msgid "CTL_STLOC (set location)\n" - msgstr "" - --#: vms-alpha.c:6437 -+#: vms-alpha.c:6438 - #, c-format - msgid "CTL_STKDL (stack defined location)\n" - msgstr "" - --#: vms-alpha.c:6440 vms-alpha.c:6864 vms-alpha.c:6990 -+#: vms-alpha.c:6441 vms-alpha.c:6865 vms-alpha.c:6991 - #, c-format - msgid "*unhandled*\n" - msgstr "" - --#: vms-alpha.c:6470 vms-alpha.c:6509 -+#: vms-alpha.c:6471 vms-alpha.c:6510 - #, c-format - msgid "cannot read GST record length\n" - msgstr "" - - #. Ill-formed. --#: vms-alpha.c:6491 -+#: vms-alpha.c:6492 - #, c-format - msgid "cannot find EMH in first GST record\n" - msgstr "" - --#: vms-alpha.c:6517 -+#: vms-alpha.c:6518 - #, c-format - msgid "cannot read GST record header\n" - msgstr "" - --#: vms-alpha.c:6530 -+#: vms-alpha.c:6531 - #, c-format - msgid " corrupted GST\n" - msgstr "" - --#: vms-alpha.c:6538 -+#: vms-alpha.c:6539 - #, c-format - msgid "cannot read GST record\n" - msgstr "" - --#: vms-alpha.c:6567 -+#: vms-alpha.c:6568 - #, c-format - msgid " unhandled EOBJ record type %u\n" - msgstr "" - --#: vms-alpha.c:6591 -+#: vms-alpha.c:6592 - #, c-format - msgid " bitcount: %u, base addr: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6605 -+#: vms-alpha.c:6606 - #, c-format - msgid " bitmap: 0x%08x (count: %u):\n" - msgstr "" - --#: vms-alpha.c:6612 -+#: vms-alpha.c:6613 - #, c-format - msgid " %08x" - msgstr "" - --#: vms-alpha.c:6638 -+#: vms-alpha.c:6639 - #, c-format - msgid " image %u (%u entries)\n" - msgstr "" - --#: vms-alpha.c:6644 -+#: vms-alpha.c:6645 - #, c-format - msgid " offset: 0x%08x, val: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6666 -+#: vms-alpha.c:6667 - #, c-format - msgid " image %u (%u entries), offsets:\n" - msgstr "" - --#: vms-alpha.c:6673 -+#: vms-alpha.c:6674 - #, c-format - msgid " 0x%08x" - msgstr "" - - #. 64 bits. --#: vms-alpha.c:6795 -+#: vms-alpha.c:6796 - #, c-format - msgid "64 bits *unhandled*\n" - msgstr "" - --#: vms-alpha.c:6800 -+#: vms-alpha.c:6801 - #, c-format - msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6811 -+#: vms-alpha.c:6812 - #, c-format - msgid "non-contiguous array of %s\n" - msgstr "" - --#: vms-alpha.c:6816 -+#: vms-alpha.c:6817 - #, c-format - msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n" - msgstr "" - --#: vms-alpha.c:6821 -+#: vms-alpha.c:6822 - #, c-format - msgid "arsize: %u, a0: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6825 -+#: vms-alpha.c:6826 - #, c-format - msgid "Strides:\n" - msgstr "" - --#: vms-alpha.c:6835 -+#: vms-alpha.c:6836 - #, c-format - msgid "Bounds:\n" - msgstr "" - --#: vms-alpha.c:6841 -+#: vms-alpha.c:6842 - #, c-format - msgid "[%u]: Lower: %u, upper: %u\n" - msgstr "" - --#: vms-alpha.c:6853 -+#: vms-alpha.c:6854 - #, c-format - msgid "unaligned bit-string of %s\n" - msgstr "" - --#: vms-alpha.c:6858 -+#: vms-alpha.c:6859 - #, c-format - msgid "base: %u, pos: %u\n" - msgstr "" - --#: vms-alpha.c:6879 -+#: vms-alpha.c:6880 - #, c-format - msgid "vflags: 0x%02x, value: 0x%08x " - msgstr "" - --#: vms-alpha.c:6885 -+#: vms-alpha.c:6886 - #, c-format - msgid "(no value)\n" - msgstr "" - --#: vms-alpha.c:6888 -+#: vms-alpha.c:6889 - #, c-format - msgid "(not active)\n" - msgstr "" - --#: vms-alpha.c:6891 -+#: vms-alpha.c:6892 - #, c-format - msgid "(not allocated)\n" - msgstr "" - --#: vms-alpha.c:6894 -+#: vms-alpha.c:6895 - #, c-format - msgid "(descriptor)\n" - msgstr "" - --#: vms-alpha.c:6898 -+#: vms-alpha.c:6899 - #, c-format - msgid "(trailing value)\n" - msgstr "" - --#: vms-alpha.c:6901 -+#: vms-alpha.c:6902 - #, c-format - msgid "(value spec follows)\n" - msgstr "" - --#: vms-alpha.c:6904 -+#: vms-alpha.c:6905 - #, c-format - msgid "(at bit offset %u)\n" - msgstr "" - --#: vms-alpha.c:6908 -+#: vms-alpha.c:6909 - #, c-format - msgid "(reg: %u, disp: %u, indir: %u, kind: " - msgstr "" - --#: vms-alpha.c:6915 -+#: vms-alpha.c:6916 - msgid "literal" - msgstr "" - --#: vms-alpha.c:6918 -+#: vms-alpha.c:6919 - msgid "address" - msgstr "" - --#: vms-alpha.c:6921 -+#: vms-alpha.c:6922 - msgid "desc" - msgstr "" - --#: vms-alpha.c:6924 -+#: vms-alpha.c:6925 - msgid "reg" - msgstr "" - --#: vms-alpha.c:6941 -+#: vms-alpha.c:6942 - #, c-format - msgid "len: %2u, kind: %2u " - msgstr "" - --#: vms-alpha.c:6947 -+#: vms-alpha.c:6948 - #, c-format - msgid "atomic, type=0x%02x %s\n" - msgstr "" - --#: vms-alpha.c:6951 -+#: vms-alpha.c:6952 - #, c-format - msgid "indirect, defined at 0x%08x\n" - msgstr "" - --#: vms-alpha.c:6955 -+#: vms-alpha.c:6956 - #, c-format - msgid "typed pointer\n" - msgstr "" - --#: vms-alpha.c:6959 -+#: vms-alpha.c:6960 - #, c-format - msgid "pointer\n" - msgstr "" - --#: vms-alpha.c:6967 -+#: vms-alpha.c:6968 - #, c-format - msgid "array, dim: %u, bitmap: " - msgstr "" - --#: vms-alpha.c:6974 -+#: vms-alpha.c:6975 - #, c-format - msgid "array descriptor:\n" - msgstr "" - --#: vms-alpha.c:6981 -+#: vms-alpha.c:6982 - #, c-format - msgid "type spec for element:\n" - msgstr "" - --#: vms-alpha.c:6983 -+#: vms-alpha.c:6984 - #, c-format - msgid "type spec for subscript %u:\n" - msgstr "" - --#: vms-alpha.c:7001 -+#: vms-alpha.c:7002 - #, c-format - msgid "Debug symbol table:\n" - msgstr "" - --#: vms-alpha.c:7012 -+#: vms-alpha.c:7013 - #, c-format - msgid "cannot read DST header\n" - msgstr "" - --#: vms-alpha.c:7018 -+#: vms-alpha.c:7019 - #, c-format - msgid " type: %3u, len: %3u (at 0x%08x): " - msgstr "" - --#: vms-alpha.c:7032 -+#: vms-alpha.c:7033 - #, c-format - msgid "cannot read DST symbol\n" - msgstr "" - --#: vms-alpha.c:7075 -+#: vms-alpha.c:7076 - #, c-format - msgid "standard data: %s\n" - msgstr "" - --#: vms-alpha.c:7078 vms-alpha.c:7166 -+#: vms-alpha.c:7079 vms-alpha.c:7167 - #, c-format - msgid " name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7085 -+#: vms-alpha.c:7086 - #, c-format - msgid "modbeg\n" - msgstr "" - --#: vms-alpha.c:7087 -+#: vms-alpha.c:7088 - #, c-format - msgid " flags: %d, language: %u, major: %u, minor: %u\n" - msgstr "" - --#: vms-alpha.c:7093 vms-alpha.c:7367 -+#: vms-alpha.c:7094 vms-alpha.c:7368 - #, c-format - msgid " module name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7096 -+#: vms-alpha.c:7097 - #, c-format - msgid " compiler : %.*s\n" - msgstr "" - --#: vms-alpha.c:7101 -+#: vms-alpha.c:7102 - #, c-format - msgid "modend\n" - msgstr "" - --#: vms-alpha.c:7108 -+#: vms-alpha.c:7109 - msgid "rtnbeg\n" - msgstr "" - --#: vms-alpha.c:7110 -+#: vms-alpha.c:7111 - #, c-format - msgid " flags: %u, address: 0x%08x, pd-address: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7115 -+#: vms-alpha.c:7116 - #, c-format - msgid " routine name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7123 -+#: vms-alpha.c:7124 - #, c-format - msgid "rtnend: size 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7131 -+#: vms-alpha.c:7132 - #, c-format - msgid "prolog: bkpt address 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7140 -+#: vms-alpha.c:7141 - #, c-format - msgid "epilog: flags: %u, count: %u\n" - msgstr "" - --#: vms-alpha.c:7150 -+#: vms-alpha.c:7151 - #, c-format - msgid "blkbeg: address: 0x%08x, name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7159 -+#: vms-alpha.c:7160 - #, c-format - msgid "blkend: size: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7165 -+#: vms-alpha.c:7166 - #, c-format - msgid "typspec (len: %u)\n" - msgstr "" - --#: vms-alpha.c:7172 -+#: vms-alpha.c:7173 - #, c-format - msgid "septyp, name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7181 -+#: vms-alpha.c:7182 - #, c-format - msgid "recbeg: name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7183 -+#: vms-alpha.c:7184 - #, c-format - msgid " len: %u bits\n" - msgstr "" - --#: vms-alpha.c:7188 -+#: vms-alpha.c:7189 - #, c-format - msgid "recend\n" - msgstr "" - --#: vms-alpha.c:7192 -+#: vms-alpha.c:7193 - #, c-format - msgid "enumbeg, len: %u, name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7196 -+#: vms-alpha.c:7197 - #, c-format - msgid "enumelt, name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7200 -+#: vms-alpha.c:7201 - #, c-format - msgid "enumend\n" - msgstr "" - --#: vms-alpha.c:7205 -+#: vms-alpha.c:7206 - #, c-format - msgid "label, name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7207 -+#: vms-alpha.c:7208 - #, c-format - msgid " address: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7217 -+#: vms-alpha.c:7218 - #, c-format - msgid "discontiguous range (nbr: %u)\n" - msgstr "" - --#: vms-alpha.c:7220 -+#: vms-alpha.c:7221 - #, c-format - msgid " address: 0x%08x, size: %u\n" - msgstr "" - --#: vms-alpha.c:7230 -+#: vms-alpha.c:7231 - #, c-format - msgid "line num (len: %u)\n" - msgstr "" - --#: vms-alpha.c:7247 -+#: vms-alpha.c:7248 - #, c-format - msgid "delta_pc_w %u\n" - msgstr "" - --#: vms-alpha.c:7254 -+#: vms-alpha.c:7255 - #, c-format - msgid "incr_linum(b): +%u\n" - msgstr "" - --#: vms-alpha.c:7260 -+#: vms-alpha.c:7261 - #, c-format - msgid "incr_linum_w: +%u\n" - msgstr "" - --#: vms-alpha.c:7266 -+#: vms-alpha.c:7267 - #, c-format - msgid "incr_linum_l: +%u\n" - msgstr "" - --#: vms-alpha.c:7272 -+#: vms-alpha.c:7273 - #, c-format - msgid "set_line_num(w) %u\n" - msgstr "" - --#: vms-alpha.c:7277 -+#: vms-alpha.c:7278 - #, c-format - msgid "set_line_num_b %u\n" - msgstr "" - --#: vms-alpha.c:7282 -+#: vms-alpha.c:7283 - #, c-format - msgid "set_line_num_l %u\n" - msgstr "" - --#: vms-alpha.c:7287 -+#: vms-alpha.c:7288 - #, c-format - msgid "set_abs_pc: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7291 -+#: vms-alpha.c:7292 - #, c-format - msgid "delta_pc_l: +0x%08x\n" - msgstr "" - --#: vms-alpha.c:7296 -+#: vms-alpha.c:7297 - #, c-format - msgid "term(b): 0x%02x" - msgstr "" - --#: vms-alpha.c:7298 -+#: vms-alpha.c:7299 - #, c-format - msgid " pc: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7303 -+#: vms-alpha.c:7304 - #, c-format - msgid "term_w: 0x%04x" - msgstr "" - --#: vms-alpha.c:7305 -+#: vms-alpha.c:7306 - #, c-format - msgid " pc: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7311 -+#: vms-alpha.c:7312 - #, c-format - msgid "delta pc +%-4d" - msgstr "" - --#: vms-alpha.c:7315 -+#: vms-alpha.c:7316 - #, c-format - msgid " pc: 0x%08x line: %5u\n" - msgstr "" - --#: vms-alpha.c:7320 -+#: vms-alpha.c:7321 - #, c-format - msgid " *unhandled* cmd %u\n" - msgstr "" - --#: vms-alpha.c:7335 -+#: vms-alpha.c:7336 - #, c-format - msgid "source (len: %u)\n" - msgstr "" - --#: vms-alpha.c:7350 -+#: vms-alpha.c:7351 - #, c-format - msgid " declfile: len: %u, flags: %u, fileid: %u\n" - msgstr "" - --#: vms-alpha.c:7355 -+#: vms-alpha.c:7356 - #, c-format - msgid " rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n" - msgstr "" - --#: vms-alpha.c:7364 -+#: vms-alpha.c:7365 - #, c-format - msgid " filename : %.*s\n" - msgstr "" - --#: vms-alpha.c:7373 -+#: vms-alpha.c:7374 - #, c-format - msgid " setfile %u\n" - msgstr "" - --#: vms-alpha.c:7378 vms-alpha.c:7383 -+#: vms-alpha.c:7379 vms-alpha.c:7384 - #, c-format - msgid " setrec %u\n" - msgstr "" - --#: vms-alpha.c:7388 vms-alpha.c:7393 -+#: vms-alpha.c:7389 vms-alpha.c:7394 - #, c-format - msgid " setlnum %u\n" - msgstr "" - --#: vms-alpha.c:7398 vms-alpha.c:7403 -+#: vms-alpha.c:7399 vms-alpha.c:7404 - #, c-format - msgid " deflines %u\n" - msgstr "" - --#: vms-alpha.c:7407 -+#: vms-alpha.c:7408 - #, c-format - msgid " formfeed\n" - msgstr "" - --#: vms-alpha.c:7411 -+#: vms-alpha.c:7412 - #, c-format - msgid " *unhandled* cmd %u\n" - msgstr "" - --#: vms-alpha.c:7423 -+#: vms-alpha.c:7424 - #, c-format - msgid "*unhandled* dst type %u\n" - msgstr "" - --#: vms-alpha.c:7455 -+#: vms-alpha.c:7456 - #, c-format - msgid "cannot read EIHD\n" - msgstr "" - --#: vms-alpha.c:7459 -+#: vms-alpha.c:7460 - #, c-format - msgid "EIHD: (size: %u, nbr blocks: %u)\n" - msgstr "" - --#: vms-alpha.c:7463 -+#: vms-alpha.c:7464 - #, c-format - msgid " majorid: %u, minorid: %u\n" - msgstr "" - --#: vms-alpha.c:7471 -+#: vms-alpha.c:7472 - msgid "executable" - msgstr "" - --#: vms-alpha.c:7474 -+#: vms-alpha.c:7475 - msgid "linkable image" - msgstr "" - --#: vms-alpha.c:7481 -+#: vms-alpha.c:7482 - #, c-format - msgid " image type: %u (%s)" - msgstr "" - --#: vms-alpha.c:7487 -+#: vms-alpha.c:7488 - msgid "native" - msgstr "" - --#: vms-alpha.c:7490 -+#: vms-alpha.c:7491 - msgid "CLI" - msgstr "" - --#: vms-alpha.c:7497 -+#: vms-alpha.c:7498 - #, c-format - msgid ", subtype: %u (%s)\n" - msgstr "" - --#: vms-alpha.c:7504 -+#: vms-alpha.c:7505 - #, c-format - msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n" - msgstr "" - --#: vms-alpha.c:7508 -+#: vms-alpha.c:7509 - #, c-format - msgid " fixup info rva: " - msgstr "" - --#: vms-alpha.c:7510 -+#: vms-alpha.c:7511 - #, c-format - msgid ", symbol vector rva: " - msgstr "" - --#: vms-alpha.c:7513 -+#: vms-alpha.c:7514 - #, c-format - msgid "" - "\n" - " version array off: %u\n" - msgstr "" - --#: vms-alpha.c:7518 -+#: vms-alpha.c:7519 - #, c-format - msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n" - msgstr "" - --#: vms-alpha.c:7524 -+#: vms-alpha.c:7525 - #, c-format - msgid " linker flags: %08x:" - msgstr "" - --#: vms-alpha.c:7555 -+#: vms-alpha.c:7556 - #, c-format - msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n" - msgstr "" - --#: vms-alpha.c:7561 -+#: vms-alpha.c:7562 - #, c-format - msgid " BPAGE: %u" - msgstr "" - --#: vms-alpha.c:7568 -+#: vms-alpha.c:7569 - #, c-format - msgid ", ext fixup offset: %u, no_opt psect off: %u" - msgstr "" - --#: vms-alpha.c:7571 -+#: vms-alpha.c:7572 - #, c-format - msgid ", alias: %u\n" - msgstr "" - --#: vms-alpha.c:7579 -+#: vms-alpha.c:7580 - #, c-format - msgid "system version array information:\n" - msgstr "" - --#: vms-alpha.c:7583 -+#: vms-alpha.c:7584 - #, c-format - msgid "cannot read EIHVN header\n" - msgstr "" - --#: vms-alpha.c:7593 -+#: vms-alpha.c:7594 - #, c-format - msgid "cannot read EIHVN version\n" - msgstr "" - --#: vms-alpha.c:7596 -+#: vms-alpha.c:7597 - #, c-format - msgid " %02u " - msgstr "" - --#: vms-alpha.c:7600 -+#: vms-alpha.c:7601 - msgid "BASE_IMAGE " - msgstr "" - --#: vms-alpha.c:7603 -+#: vms-alpha.c:7604 - msgid "MEMORY_MANAGEMENT" - msgstr "" - --#: vms-alpha.c:7606 -+#: vms-alpha.c:7607 - msgid "IO " - msgstr "" - --#: vms-alpha.c:7609 -+#: vms-alpha.c:7610 - msgid "FILES_VOLUMES " - msgstr "" - --#: vms-alpha.c:7612 -+#: vms-alpha.c:7613 - msgid "PROCESS_SCHED " - msgstr "" - --#: vms-alpha.c:7615 -+#: vms-alpha.c:7616 - msgid "SYSGEN " - msgstr "" - --#: vms-alpha.c:7618 -+#: vms-alpha.c:7619 - msgid "CLUSTERS_LOCKMGR " - msgstr "" - --#: vms-alpha.c:7621 -+#: vms-alpha.c:7622 - msgid "LOGICAL_NAMES " - msgstr "" - --#: vms-alpha.c:7624 -+#: vms-alpha.c:7625 - msgid "SECURITY " - msgstr "" - --#: vms-alpha.c:7627 -+#: vms-alpha.c:7628 - msgid "IMAGE_ACTIVATOR " - msgstr "" - --#: vms-alpha.c:7630 -+#: vms-alpha.c:7631 - msgid "NETWORKS " - msgstr "" - --#: vms-alpha.c:7633 -+#: vms-alpha.c:7634 - msgid "COUNTERS " - msgstr "" - --#: vms-alpha.c:7636 -+#: vms-alpha.c:7637 - msgid "STABLE " - msgstr "" - --#: vms-alpha.c:7639 -+#: vms-alpha.c:7640 - msgid "MISC " - msgstr "" - --#: vms-alpha.c:7642 -+#: vms-alpha.c:7643 - msgid "CPU " - msgstr "" - --#: vms-alpha.c:7645 -+#: vms-alpha.c:7646 - msgid "VOLATILE " - msgstr "" - --#: vms-alpha.c:7648 -+#: vms-alpha.c:7649 - msgid "SHELL " - msgstr "" - --#: vms-alpha.c:7651 -+#: vms-alpha.c:7652 - msgid "POSIX " - msgstr "" - --#: vms-alpha.c:7654 -+#: vms-alpha.c:7655 - msgid "MULTI_PROCESSING " - msgstr "" - --#: vms-alpha.c:7657 -+#: vms-alpha.c:7658 - msgid "GALAXY " - msgstr "" - --#: vms-alpha.c:7660 -+#: vms-alpha.c:7661 - msgid "*unknown* " - msgstr "" - --#: vms-alpha.c:7676 vms-alpha.c:7951 -+#: vms-alpha.c:7677 vms-alpha.c:7952 - #, c-format - msgid "cannot read EIHA\n" - msgstr "" - --#: vms-alpha.c:7679 -+#: vms-alpha.c:7680 - #, c-format - msgid "Image activation: (size=%u)\n" - msgstr "" - --#: vms-alpha.c:7682 -+#: vms-alpha.c:7683 - #, c-format - msgid " First address : 0x%08x 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7686 -+#: vms-alpha.c:7687 - #, c-format - msgid " Second address: 0x%08x 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7690 -+#: vms-alpha.c:7691 - #, c-format - msgid " Third address : 0x%08x 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7694 -+#: vms-alpha.c:7695 - #, c-format - msgid " Fourth address: 0x%08x 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7698 -+#: vms-alpha.c:7699 - #, c-format - msgid " Shared image : 0x%08x 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7709 -+#: vms-alpha.c:7710 - #, c-format - msgid "cannot read EIHI\n" - msgstr "" - --#: vms-alpha.c:7713 -+#: vms-alpha.c:7714 - #, c-format - msgid "Image identification: (major: %u, minor: %u)\n" - msgstr "" - --#: vms-alpha.c:7716 -+#: vms-alpha.c:7717 - #, c-format - msgid " image name : %.*s\n" - msgstr "" - --#: vms-alpha.c:7718 -+#: vms-alpha.c:7719 - #, c-format - msgid " link time : %s\n" - msgstr "" - --#: vms-alpha.c:7720 -+#: vms-alpha.c:7721 - #, c-format - msgid " image ident : %.*s\n" - msgstr "" - --#: vms-alpha.c:7722 -+#: vms-alpha.c:7723 - #, c-format - msgid " linker ident : %.*s\n" - msgstr "" - --#: vms-alpha.c:7724 -+#: vms-alpha.c:7725 - #, c-format - msgid " image build ident: %.*s\n" - msgstr "" - --#: vms-alpha.c:7734 -+#: vms-alpha.c:7735 - #, c-format - msgid "cannot read EIHS\n" - msgstr "" - --#: vms-alpha.c:7738 -+#: vms-alpha.c:7739 - #, c-format - msgid "Image symbol & debug table: (major: %u, minor: %u)\n" - msgstr "" - --#: vms-alpha.c:7744 -+#: vms-alpha.c:7745 - #, c-format - msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n" - msgstr "" - --#: vms-alpha.c:7749 -+#: vms-alpha.c:7750 - #, c-format - msgid " global symbol table: vbn: %u, records: %u\n" - msgstr "" - --#: vms-alpha.c:7754 -+#: vms-alpha.c:7755 - #, c-format - msgid " debug module table : vbn: %u, size: %u\n" - msgstr "" - --#: vms-alpha.c:7767 -+#: vms-alpha.c:7768 - #, c-format - msgid "cannot read EISD\n" - msgstr "" - --#: vms-alpha.c:7778 -+#: vms-alpha.c:7779 - #, c-format - msgid "" - "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n" - msgstr "" - --#: vms-alpha.c:7786 -+#: vms-alpha.c:7787 - #, c-format - msgid " section: base: 0x%08x%08x size: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7791 -+#: vms-alpha.c:7792 - #, c-format - msgid " flags: 0x%04x" - msgstr "" - --#: vms-alpha.c:7829 -+#: vms-alpha.c:7830 - #, c-format - msgid " vbn: %u, pfc: %u, matchctl: %u type: %u (" - msgstr "" - --#: vms-alpha.c:7835 -+#: vms-alpha.c:7836 - msgid "NORMAL" - msgstr "" - --#: vms-alpha.c:7838 -+#: vms-alpha.c:7839 - msgid "SHRFXD" - msgstr "" - --#: vms-alpha.c:7841 -+#: vms-alpha.c:7842 - msgid "PRVFXD" - msgstr "" - --#: vms-alpha.c:7844 -+#: vms-alpha.c:7845 - msgid "SHRPIC" - msgstr "" - --#: vms-alpha.c:7847 -+#: vms-alpha.c:7848 - msgid "PRVPIC" - msgstr "" - --#: vms-alpha.c:7850 -+#: vms-alpha.c:7851 - msgid "USRSTACK" - msgstr "" - --#: vms-alpha.c:7856 -+#: vms-alpha.c:7857 - msgid ")\n" - msgstr "" - --#: vms-alpha.c:7859 -+#: vms-alpha.c:7860 - #, c-format - msgid " ident: 0x%08x, name: %.*s\n" - msgstr "" - --#: vms-alpha.c:7869 -+#: vms-alpha.c:7870 - #, c-format - msgid "cannot read DMT\n" - msgstr "" - --#: vms-alpha.c:7873 -+#: vms-alpha.c:7874 - #, c-format - msgid "Debug module table:\n" - msgstr "" - --#: vms-alpha.c:7882 -+#: vms-alpha.c:7883 - #, c-format - msgid "cannot read DMT header\n" - msgstr "" - --#: vms-alpha.c:7888 -+#: vms-alpha.c:7889 - #, c-format - msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n" - msgstr "" - --#: vms-alpha.c:7898 -+#: vms-alpha.c:7899 - #, c-format - msgid "cannot read DMT psect\n" - msgstr "" - --#: vms-alpha.c:7902 -+#: vms-alpha.c:7903 - #, c-format - msgid " psect start: 0x%08x, length: %u\n" - msgstr "" - --#: vms-alpha.c:7915 -+#: vms-alpha.c:7916 - #, c-format - msgid "cannot read DST\n" - msgstr "" - --#: vms-alpha.c:7925 -+#: vms-alpha.c:7926 - #, c-format - msgid "cannot read GST\n" - msgstr "" - --#: vms-alpha.c:7929 -+#: vms-alpha.c:7930 - #, c-format - msgid "Global symbol table:\n" - msgstr "" - --#: vms-alpha.c:7958 -+#: vms-alpha.c:7959 - #, c-format - msgid "Image activator fixup: (major: %u, minor: %u)\n" - msgstr "" - --#: vms-alpha.c:7962 -+#: vms-alpha.c:7963 - #, c-format - msgid " iaflink : 0x%08x %08x\n" - msgstr "" - --#: vms-alpha.c:7966 -+#: vms-alpha.c:7967 - #, c-format - msgid " fixuplnk: 0x%08x %08x\n" - msgstr "" - --#: vms-alpha.c:7969 -+#: vms-alpha.c:7970 - #, c-format - msgid " size : %u\n" - msgstr "" - --#: vms-alpha.c:7971 -+#: vms-alpha.c:7972 - #, c-format - msgid " flags: 0x%08x\n" - msgstr "" - --#: vms-alpha.c:7976 -+#: vms-alpha.c:7977 - #, c-format - msgid " qrelfixoff: %5u, lrelfixoff: %5u\n" - msgstr "" - --#: vms-alpha.c:7981 -+#: vms-alpha.c:7982 - #, c-format - msgid " qdotadroff: %5u, ldotadroff: %5u\n" - msgstr "" - --#: vms-alpha.c:7986 -+#: vms-alpha.c:7987 - #, c-format - msgid " codeadroff: %5u, lpfixoff : %5u\n" - msgstr "" - --#: vms-alpha.c:7989 -+#: vms-alpha.c:7990 - #, c-format - msgid " chgprtoff : %5u\n" - msgstr "" - --#: vms-alpha.c:7993 -+#: vms-alpha.c:7994 - #, c-format - msgid " shlstoff : %5u, shrimgcnt : %5u\n" - msgstr "" - --#: vms-alpha.c:7996 -+#: vms-alpha.c:7997 - #, c-format - msgid " shlextra : %5u, permctx : %5u\n" - msgstr "" - --#: vms-alpha.c:7999 -+#: vms-alpha.c:8000 - #, c-format - msgid " base_va : 0x%08x\n" - msgstr "" - --#: vms-alpha.c:8001 -+#: vms-alpha.c:8002 - #, c-format - msgid " lppsbfixoff: %5u\n" - msgstr "" - --#: vms-alpha.c:8009 -+#: vms-alpha.c:8010 - #, c-format - msgid " Shareable images:\n" - msgstr "" - --#: vms-alpha.c:8014 -+#: vms-alpha.c:8015 - #, c-format - msgid " %u: size: %u, flags: 0x%02x, name: %.*s\n" - msgstr "" - --#: vms-alpha.c:8021 -+#: vms-alpha.c:8022 - #, c-format - msgid " quad-word relocation fixups:\n" - msgstr "" - --#: vms-alpha.c:8026 -+#: vms-alpha.c:8027 - #, c-format - msgid " long-word relocation fixups:\n" - msgstr "" - --#: vms-alpha.c:8031 -+#: vms-alpha.c:8032 - #, c-format - msgid " quad-word .address reference fixups:\n" - msgstr "" - --#: vms-alpha.c:8036 -+#: vms-alpha.c:8037 - #, c-format - msgid " long-word .address reference fixups:\n" - msgstr "" - --#: vms-alpha.c:8041 -+#: vms-alpha.c:8042 - #, c-format - msgid " Code Address Reference Fixups:\n" - msgstr "" - --#: vms-alpha.c:8046 -+#: vms-alpha.c:8047 - #, c-format - msgid " Linkage Pairs Reference Fixups:\n" - msgstr "" - --#: vms-alpha.c:8055 -+#: vms-alpha.c:8056 - #, c-format - msgid " Change Protection (%u entries):\n" - msgstr "" - --#: vms-alpha.c:8061 -+#: vms-alpha.c:8062 - #, c-format - msgid " base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x " - msgstr "" - - #. FIXME: we do not yet support relocatable link. It is not obvious - #. how to do it for debug infos. --#: vms-alpha.c:8901 -+#: vms-alpha.c:8902 - msgid "%P: relocatable link is not supported\n" - msgstr "" - --#: vms-alpha.c:8972 -+#: vms-alpha.c:8973 - #, c-format --msgid "%P: multiple entry points: in modules %B and %B\n" -+msgid "%P: multiple entry points: in modules %pB and %pB\n" - msgstr "" - - #: vms-lib.c:1445 -@@ -8594,7 +8564,7 @@ msgstr "" - #: peigen.c:1906 peigen.c:2103 pepigen.c:1906 pepigen.c:2103 pex64igen.c:1906 - #: pex64igen.c:2103 - #, c-format --msgid "Warning, .pdata section size (%ld) is not a multiple of %d\n" -+msgid "warning, .pdata section size (%ld) is not a multiple of %d\n" - msgstr "" - - #: peigen.c:1910 peigen.c:2107 pepigen.c:1910 pepigen.c:2107 pex64igen.c:1910 -@@ -8795,82 +8765,92 @@ msgid "" - "Characteristics 0x%x\n" - msgstr "" - --#: peigen.c:2989 pepigen.c:2989 pex64igen.c:2989 -+#: peigen.c:2990 pepigen.c:2990 pex64igen.c:2990 - #, c-format --msgid "%B: Data Directory size (%lx) exceeds space left in section (%Lx)" -+msgid "" -+"%pB: Data Directory size (%lx) exceeds space left in section (%<PRIx64>)" - msgstr "" - --#: peigen.c:3019 pepigen.c:3019 pex64igen.c:3019 --msgid "Failed to update file offsets in debug directory" -+#: peigen.c:3021 pepigen.c:3021 pex64igen.c:3021 -+msgid "failed to update file offsets in debug directory" - msgstr "" - --#: peigen.c:3025 pepigen.c:3025 pex64igen.c:3025 --msgid "%B: Failed to read debug data section" -+#: peigen.c:3027 pepigen.c:3027 pex64igen.c:3027 -+#, c-format -+msgid "%pB: failed to read debug data section" - msgstr "" - --#: peigen.c:3841 pepigen.c:3841 pex64igen.c:3841 -+#: peigen.c:3843 pepigen.c:3843 pex64igen.c:3843 - #, c-format - msgid ".rsrc merge failure: duplicate string resource: %d" - msgstr "" - --#: peigen.c:3976 pepigen.c:3976 pex64igen.c:3976 -+#: peigen.c:3978 pepigen.c:3978 pex64igen.c:3978 - msgid ".rsrc merge failure: multiple non-default manifests" - msgstr "" - --#: peigen.c:3994 pepigen.c:3994 pex64igen.c:3994 -+#: peigen.c:3996 pepigen.c:3996 pex64igen.c:3996 - msgid ".rsrc merge failure: a directory matches a leaf" - msgstr "" - --#: peigen.c:4036 pepigen.c:4036 pex64igen.c:4036 -+#: peigen.c:4038 pepigen.c:4038 pex64igen.c:4038 - msgid ".rsrc merge failure: duplicate leaf" - msgstr "" - --#: peigen.c:4038 pepigen.c:4038 pex64igen.c:4038 -+#: peigen.c:4040 pepigen.c:4040 pex64igen.c:4040 - #, c-format - msgid ".rsrc merge failure: duplicate leaf: %s" - msgstr "" - --#: peigen.c:4104 pepigen.c:4104 pex64igen.c:4104 --msgid ".rsrc merge failure: dirs with differing characteristics\n" -+#: peigen.c:4106 pepigen.c:4106 pex64igen.c:4106 -+msgid ".rsrc merge failure: dirs with differing characteristics" - msgstr "" - --#: peigen.c:4111 pepigen.c:4111 pex64igen.c:4111 --msgid ".rsrc merge failure: differing directory versions\n" -+#: peigen.c:4113 pepigen.c:4113 pex64igen.c:4113 -+msgid ".rsrc merge failure: differing directory versions" - msgstr "" - - #. Corrupted .rsrc section - cannot merge. --#: peigen.c:4228 pepigen.c:4228 pex64igen.c:4228 --msgid "%B: .rsrc merge failure: corrupt .rsrc section" -+#: peigen.c:4230 pepigen.c:4230 pex64igen.c:4230 -+#, c-format -+msgid "%pB: .rsrc merge failure: corrupt .rsrc section" - msgstr "" - --#: peigen.c:4236 pepigen.c:4236 pex64igen.c:4236 --msgid "%B: .rsrc merge failure: unexpected .rsrc size" -+#: peigen.c:4238 pepigen.c:4238 pex64igen.c:4238 -+#, c-format -+msgid "%pB: .rsrc merge failure: unexpected .rsrc size" - msgstr "" - --#: peigen.c:4375 pepigen.c:4375 pex64igen.c:4375 --msgid "%B: unable to fill in DataDictionary[1] because .idata$2 is missing" -+#: peigen.c:4377 pepigen.c:4377 pex64igen.c:4377 -+#, c-format -+msgid "%pB: unable to fill in DataDictionary[1] because .idata$2 is missing" - msgstr "" - --#: peigen.c:4395 pepigen.c:4395 pex64igen.c:4395 --msgid "%B: unable to fill in DataDictionary[1] because .idata$4 is missing" -+#: peigen.c:4397 pepigen.c:4397 pex64igen.c:4397 -+#, c-format -+msgid "%pB: unable to fill in DataDictionary[1] because .idata$4 is missing" - msgstr "" - --#: peigen.c:4416 pepigen.c:4416 pex64igen.c:4416 --msgid "%B: unable to fill in DataDictionary[12] because .idata$5 is missing" -+#: peigen.c:4418 pepigen.c:4418 pex64igen.c:4418 -+#, c-format -+msgid "%pB: unable to fill in DataDictionary[12] because .idata$5 is missing" - msgstr "" - --#: peigen.c:4436 pepigen.c:4436 pex64igen.c:4436 -+#: peigen.c:4438 pepigen.c:4438 pex64igen.c:4438 -+#, c-format - msgid "" --"%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because ." -+"%pB: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because ." - "idata$6 is missing" - msgstr "" - --#: peigen.c:4478 pepigen.c:4478 pex64igen.c:4478 -+#: peigen.c:4480 pepigen.c:4480 pex64igen.c:4480 -+#, c-format - msgid "" --"%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because ." -+"%pB: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because ." - "idata$6 is missing" - msgstr "" - --#: peigen.c:4503 pepigen.c:4503 pex64igen.c:4503 --msgid "%B: unable to fill in DataDictionary[9] because __tls_used is missing" -+#: peigen.c:4505 pepigen.c:4505 pex64igen.c:4505 -+#, c-format -+msgid "%pB: unable to fill in DataDictionary[9] because __tls_used is missing" - msgstr "" -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,5 +1,9 @@ - 2018-04-24 Nick Clifton <nickc@redhat.com> - -+ PR 23110 -+ * peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Check for -+ a negative PE_DEBUG_DATA size before iterating over the debug data. -+ - PR 23113 - * elf.c (ignore_section_sym): Check for the output_section pointer - being NULL before dereferencing it. diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10535.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10535.patch deleted file mode 100644 index fa8fbd2ae..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-10535.patch +++ /dev/null @@ -1,61 +0,0 @@ -From db0c309f4011ca94a4abc8458e27f3734dab92ac Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Tue, 24 Apr 2018 16:57:04 +0100 -Subject: [PATCH] Fix an illegal memory access when trying to copy an ELF - binary with corrupt section symbols. - - PR 23113 - * elf.c (ignore_section_sym): Check for the output_section pointer - being NULL before dereferencing it. - -Upstream-Status: Backport -CVE: CVE-2018-10535 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - bfd/ChangeLog | 4 ++++ - bfd/elf.c | 9 ++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -Index: git/bfd/elf.c -=================================================================== ---- git.orig/bfd/elf.c -+++ git/bfd/elf.c -@@ -4021,15 +4021,22 @@ ignore_section_sym (bfd *abfd, asymbol * - { - elf_symbol_type *type_ptr; - -+ if (sym == NULL) -+ return FALSE; -+ - if ((sym->flags & BSF_SECTION_SYM) == 0) - return FALSE; - -+ if (sym->section == NULL) -+ return TRUE; -+ - type_ptr = elf_symbol_from (abfd, sym); - return ((type_ptr != NULL - && type_ptr->internal_elf_sym.st_shndx != 0 - && bfd_is_abs_section (sym->section)) - || !(sym->section->owner == abfd -- || (sym->section->output_section->owner == abfd -+ || (sym->section->output_section != NULL -+ && sym->section->output_section->owner == abfd - && sym->section->output_offset == 0) - || bfd_is_abs_section (sym->section))); - } -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,3 +1,9 @@ -+2018-04-24 Nick Clifton <nickc@redhat.com> -+ -+ PR 23113 -+ * elf.c (ignore_section_sym): Check for the output_section pointer -+ being NULL before dereferencing it. -+ - 2018-04-17 Nick Clifton <nickc@redhat.com> - - PR 23065 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch new file mode 100644 index 000000000..813509160 --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch @@ -0,0 +1,144 @@ +From 30838132997e6a3cfe3ec11c58b32b22f6f6b102 Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Thu, 20 Sep 2018 15:29:17 +0930 +Subject: [PATCH] Bug 23686, two segment faults in nm + +Fixes the bugs exposed by the testcases in the PR, plus two more bugs +I noticed when looking at _bfd_stab_section_find_nearest_line. + + PR 23686 + * dwarf2.c (read_section): Error when attempting to malloc + "(bfd_size_type) -1". + * syms.c (_bfd_stab_section_find_nearest_line): Bounds check + function_name. Bounds check reloc address. Formatting. Ensure + .stabstr zero terminated. +CVE: CVE-2018-17358 and CVE-2018-17359 +Upstream-Status: Backport +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + bfd/ChangeLog | 9 +++++++++ + bfd/dwarf2.c | 9 ++++++++- + bfd/syms.c | 22 ++++++++++++++++------ + 3 files changed, 33 insertions(+), 7 deletions(-) + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index 04c0c2a..fef5479 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,12 @@ ++2018-09-20 Alan Modra <amodra@gmail.com> ++ ++ PR 23686 ++ * dwarf2.c (read_section): Error when attempting to malloc ++ "(bfd_size_type) -1". ++ * syms.c (_bfd_stab_section_find_nearest_line): Bounds check ++ function_name. Bounds check reloc address. Formatting. Ensure ++ .stabstr zero terminated. ++ + 2018-08-12 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/23428 +diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c +index 3b28855..77a7368 100644 +--- a/bfd/dwarf2.c ++++ b/bfd/dwarf2.c +@@ -527,6 +527,7 @@ read_section (bfd * abfd, + asection *msec; + const char *section_name = sec->uncompressed_name; + bfd_byte *contents = *section_buffer; ++ bfd_size_type amt; + + /* The section may have already been read. */ + if (contents == NULL) +@@ -549,7 +550,13 @@ read_section (bfd * abfd, + *section_size = msec->rawsize ? msec->rawsize : msec->size; + /* Paranoia - alloc one extra so that we can make sure a string + section is NUL terminated. */ +- contents = (bfd_byte *) bfd_malloc (*section_size + 1); ++ amt = *section_size + 1; ++ if (amt == 0) ++ { ++ bfd_set_error (bfd_error_no_memory); ++ return FALSE; ++ } ++ contents = (bfd_byte *) bfd_malloc (amt); + if (contents == NULL) + return FALSE; + if (syms +diff --git a/bfd/syms.c b/bfd/syms.c +index 187071f..e09640a 100644 +--- a/bfd/syms.c ++++ b/bfd/syms.c +@@ -1035,6 +1035,10 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, + 0, strsize)) + return FALSE; + ++ /* Stab strings ought to be nul terminated. Ensure the last one ++ is, to prevent running off the end of the buffer. */ ++ info->strs[strsize - 1] = 0; ++ + /* If this is a relocatable object file, we have to relocate + the entries in .stab. This should always be simple 32 bit + relocations against symbols defined in this object file, so +@@ -1073,7 +1077,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, + || r->howto->bitsize != 32 + || r->howto->pc_relative + || r->howto->bitpos != 0 +- || r->howto->dst_mask != 0xffffffff) ++ || r->howto->dst_mask != 0xffffffff ++ || r->address * bfd_octets_per_byte (abfd) + 4 > stabsize) + { + _bfd_error_handler + (_("unsupported .stab relocation")); +@@ -1195,7 +1200,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, + { + nul_fun = stab; + nul_str = str; +- if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) ++ if (file_name >= (char *) info->strs + strsize ++ || file_name < (char *) str) + file_name = NULL; + if (stab + STABSIZE + TYPEOFF < info->stabs + stabsize + && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO) +@@ -1206,7 +1212,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, + directory_name = file_name; + file_name = ((char *) str + + bfd_get_32 (abfd, stab + STRDXOFF)); +- if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) ++ if (file_name >= (char *) info->strs + strsize ++ || file_name < (char *) str) + file_name = NULL; + } + } +@@ -1217,7 +1224,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, + file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); + /* PR 17512: file: 0c680a1f. */ + /* PR 17512: file: 5da8aec4. */ +- if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) ++ if (file_name >= (char *) info->strs + strsize ++ || file_name < (char *) str) + file_name = NULL; + break; + +@@ -1226,7 +1234,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, + function_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); + if (function_name == (char *) str) + continue; +- if (function_name >= (char *) info->strs + strsize) ++ if (function_name >= (char *) info->strs + strsize ++ || function_name < (char *) str) + function_name = NULL; + + nul_fun = NULL; +@@ -1335,7 +1344,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, + if (val <= offset) + { + file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); +- if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) ++ if (file_name >= (char *) info->strs + strsize ++ || file_name < (char *) str) + file_name = NULL; + *pline = 0; + } +-- +2.9.3 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch new file mode 100644 index 000000000..cef10a754 --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch @@ -0,0 +1,65 @@ +From cf93e9c2cf8f8b2566f8fc86e961592b51b5980d Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Thu, 20 Sep 2018 18:23:17 +0930 +Subject: [PATCH] PR23685, buffer overflow + + PR 23685 + * peXXigen.c (pe_print_edata): Correct export address table + overflow checks. Check dataoff against section size too. + +CVE: CVE-2018-17360 +Upstream-Status: Backport +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + bfd/ChangeLog | 6 ++++++ + bfd/peXXigen.c | 11 ++++++----- + 2 files changed, 12 insertions(+), 5 deletions(-) + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index fef5479..81b9e56 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,5 +1,11 @@ + 2018-09-20 Alan Modra <amodra@gmail.com> + ++ PR 23685 ++ * peXXigen.c (pe_print_edata): Correct export address table ++ overflow checks. Check dataoff against section size too. ++ ++2018-09-20 Alan Modra <amodra@gmail.com> ++ + PR 23686 + * dwarf2.c (read_section): Error when attempting to malloc + "(bfd_size_type) -1". +diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +index 598f2ca..1645ef4 100644 +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -1661,7 +1661,8 @@ pe_print_edata (bfd * abfd, void * vfile) + + dataoff = addr - section->vma; + datasize = extra->DataDirectory[PE_EXPORT_TABLE].Size; +- if (datasize > section->size - dataoff) ++ if (dataoff > section->size ++ || datasize > section->size - dataoff) + { + fprintf (file, + _("\nThere is an export table in %s, but it does not fit into that section\n"), +@@ -1778,11 +1779,11 @@ pe_print_edata (bfd * abfd, void * vfile) + edt.base); + + /* PR 17512: Handle corrupt PE binaries. */ +- if (edt.eat_addr + (edt.num_functions * 4) - adj >= datasize ++ /* PR 17512 file: 140-165018-0.004. */ ++ if (edt.eat_addr - adj >= datasize + /* PR 17512: file: 092b1829 */ +- || (edt.num_functions * 4) < edt.num_functions +- /* PR 17512 file: 140-165018-0.004. */ +- || data + edt.eat_addr - adj < data) ++ || (edt.num_functions + 1) * 4 < edt.num_functions ++ || edt.eat_addr - adj + (edt.num_functions + 1) * 4 > datasize) + fprintf (file, _("\tInvalid Export Address Table rva (0x%lx) or entry count (0x%lx)\n"), + (long) edt.eat_addr, + (long) edt.num_functions); +-- +2.9.3 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch new file mode 100644 index 000000000..b240a3f99 --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch @@ -0,0 +1,308 @@ +From 0930cb3021b8078b34cf216e79eb8608d017864f Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Sat, 13 Oct 2018 22:03:02 +1030 +Subject: [PATCH] _bfd_clear_contents bounds checking + +This PR shows a fuzzed binary triggering a segfault via a bad +relocation in .debug_line. It turns out that unlike normal +relocations applied to a section, the linker applies those with +symbols from discarded sections via _bfd_clear_contents without +checking that the relocation is within the section bounds. The same +thing now happens when reading debug sections since commit +a4cd947aca23, the PR23425 fix. + + PR 23770 + PR 23425 + * reloc.c (_bfd_clear_contents): Replace "location" param with + "buf" and "off". Bounds check "off". Return status. + * cofflink.c (_bfd_coff_generic_relocate_section): Update + _bfd_clear_contents call. + * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Likewise. + * elf32-arc.c (elf_arc_relocate_section): Likewise. + * elf32-i386.c (elf_i386_relocate_section): Likewise. + * elf32-metag.c (metag_final_link_relocate): Likewise. + * elf32-nds32.c (nds32_elf_get_relocated_section_contents): Likewise. + * elf32-ppc.c (ppc_elf_relocate_section): Likewise. + * elf32-visium.c (visium_elf_relocate_section): Likewise. + * elf64-ppc.c (ppc64_elf_relocate_section): Likewise. + * elf64-x86-64.c *(elf_x86_64_relocate_section): Likewise. + * libbfd-in.h (_bfd_clear_contents): Update prototype. + * libbfd.h: Regenerate. + +Upstream-Status: Backport +CVE: CVE-2018-18605 +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + bfd/ChangeLog | 20 ++++++++++++++++++++ + bfd/cofflink.c | 2 +- + bfd/elf-bfd.h | 2 +- + bfd/elf32-arc.c | 2 +- + bfd/elf32-i386.c | 2 +- + bfd/elf32-metag.c | 2 +- + bfd/elf32-nds32.c | 8 ++++---- + bfd/elf32-ppc.c | 2 +- + bfd/elf32-visium.c | 2 +- + bfd/elf64-ppc.c | 2 +- + bfd/elf64-x86-64.c | 2 +- + bfd/libbfd-in.h | 4 ++-- + bfd/libbfd.h | 4 ++-- + bfd/reloc.c | 19 +++++++++++++------ + 14 files changed, 50 insertions(+), 23 deletions(-) + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index 68c1ff665b..e9696ee314 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,23 @@ ++2018-10-13 Alan Modra <amodra@gmail.com> ++ ++ PR 23770 ++ PR 23425 ++ * reloc.c (_bfd_clear_contents): Replace "location" param with ++ "buf" and "off". Bounds check "off". Return status. ++ * cofflink.c (_bfd_coff_generic_relocate_section): Update ++ _bfd_clear_contents call. ++ * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Likewise. ++ * elf32-arc.c (elf_arc_relocate_section): Likewise. ++ * elf32-i386.c (elf_i386_relocate_section): Likewise. ++ * elf32-metag.c (metag_final_link_relocate): Likewise. ++ * elf32-nds32.c (nds32_elf_get_relocated_section_contents): Likewise. ++ * elf32-ppc.c (ppc_elf_relocate_section): Likewise. ++ * elf32-visium.c (visium_elf_relocate_section): Likewise. ++ * elf64-ppc.c (ppc64_elf_relocate_section): Likewise. ++ * elf64-x86-64.c *(elf_x86_64_relocate_section): Likewise. ++ * libbfd-in.h (_bfd_clear_contents): Update prototype. ++ * libbfd.h: Regenerate. ++ + 2018-09-20 Alan Modra <amodra@gmail.com> + + PR 23685 +diff --git a/bfd/cofflink.c b/bfd/cofflink.c +index 2f73f72e31..b7ea69b7f9 100644 +--- a/bfd/cofflink.c ++++ b/bfd/cofflink.c +@@ -3080,7 +3080,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd, + if (sec != NULL && discarded_section (sec)) + { + _bfd_clear_contents (howto, input_bfd, input_section, +- contents + (rel->r_vaddr - input_section->vma)); ++ contents, rel->r_vaddr - input_section->vma); + continue; + } + +diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h +index cf256f70e0..3374f411f9 100644 +--- a/bfd/elf-bfd.h ++++ b/bfd/elf-bfd.h +@@ -2811,7 +2811,7 @@ extern asection _bfd_elf_large_com_section; + { \ + int i_; \ + _bfd_clear_contents (howto, input_bfd, input_section, \ +- contents + rel[index].r_offset); \ ++ contents, rel[index].r_offset); \ + \ + if (bfd_link_relocatable (info) \ + && (input_section->flags & SEC_DEBUGGING)) \ +diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c +index 7a1b3042ae..30f47a5b22 100644 +--- a/bfd/elf32-arc.c ++++ b/bfd/elf32-arc.c +@@ -1549,7 +1549,7 @@ elf_arc_relocate_section (bfd * output_bfd, + if (sec != NULL && discarded_section (sec)) + { + _bfd_clear_contents (howto, input_bfd, input_section, +- contents + rel->r_offset); ++ contents, rel->r_offset); + rel->r_info = 0; + rel->r_addend = 0; + +diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c +index 49797dcbfa..177471777d 100644 +--- a/bfd/elf32-i386.c ++++ b/bfd/elf32-i386.c +@@ -2197,7 +2197,7 @@ elf_i386_relocate_section (bfd *output_bfd, + if (sec != NULL && discarded_section (sec)) + { + _bfd_clear_contents (howto, input_bfd, input_section, +- contents + rel->r_offset); ++ contents, rel->r_offset); + wrel->r_offset = rel->r_offset; + wrel->r_info = 0; + wrel->r_addend = 0; +diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c +index efe95bddff..7f96246e5d 100644 +--- a/bfd/elf32-metag.c ++++ b/bfd/elf32-metag.c +@@ -1396,7 +1396,7 @@ metag_final_link_relocate (reloc_howto_type *howto, + rel, relend, howto, contents) \ + { \ + _bfd_clear_contents (howto, input_bfd, input_section, \ +- contents + rel->r_offset); \ ++ contents, rel->r_offset); \ + \ + if (bfd_link_relocatable (info) \ + && (input_section->flags & SEC_DEBUGGING)) \ +diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c +index 0d86e5b865..184cf320f7 100644 +--- a/bfd/elf32-nds32.c ++++ b/bfd/elf32-nds32.c +@@ -12582,14 +12582,14 @@ nds32_elf_get_relocated_section_contents (bfd *abfd, + symbol = *(*parent)->sym_ptr_ptr; + if (symbol->section && discarded_section (symbol->section)) + { +- bfd_byte *p; ++ bfd_vma off; + static reloc_howto_type none_howto + = HOWTO (0, 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, + "unused", FALSE, 0, 0, FALSE); + +- p = data + (*parent)->address * bfd_octets_per_byte (input_bfd); +- _bfd_clear_contents ((*parent)->howto, input_bfd, input_section, +- p); ++ off = (*parent)->address * bfd_octets_per_byte (input_bfd); ++ _bfd_clear_contents ((*parent)->howto, input_bfd, ++ input_section, data, off); + (*parent)->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; + (*parent)->addend = 0; + (*parent)->howto = &none_howto; +diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c +index 61f70de12e..c31e26efd7 100644 +--- a/bfd/elf32-ppc.c ++++ b/bfd/elf32-ppc.c +@@ -8232,7 +8232,7 @@ ppc_elf_relocate_section (bfd *output_bfd, + howto = ppc_elf_howto_table[r_type]; + + _bfd_clear_contents (howto, input_bfd, input_section, +- contents + rel->r_offset); ++ contents, rel->r_offset); + wrel->r_offset = rel->r_offset; + wrel->r_info = 0; + wrel->r_addend = 0; +diff --git a/bfd/elf32-visium.c b/bfd/elf32-visium.c +index e8f1c4c9e4..961366cd87 100644 +--- a/bfd/elf32-visium.c ++++ b/bfd/elf32-visium.c +@@ -621,7 +621,7 @@ visium_elf_relocate_section (bfd *output_bfd, + or sections discarded by a linker script, we just want the + section contents zeroed. Avoid any special processing. */ + _bfd_clear_contents (howto, input_bfd, input_section, +- contents + rel->r_offset); ++ contents, rel->r_offset); + + rel->r_info = 0; + rel->r_addend = 0; +diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c +index eadde17615..7c3534ac65 100644 +--- a/bfd/elf64-ppc.c ++++ b/bfd/elf64-ppc.c +@@ -14073,7 +14073,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, + { + _bfd_clear_contents (ppc64_elf_howto_table[r_type], + input_bfd, input_section, +- contents + rel->r_offset); ++ contents, rel->r_offset); + wrel->r_offset = rel->r_offset; + wrel->r_info = 0; + wrel->r_addend = 0; +diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c +index c3a6c31ed2..4dcab43478 100644 +--- a/bfd/elf64-x86-64.c ++++ b/bfd/elf64-x86-64.c +@@ -2490,7 +2490,7 @@ elf_x86_64_relocate_section (bfd *output_bfd, + if (sec != NULL && discarded_section (sec)) + { + _bfd_clear_contents (howto, input_bfd, input_section, +- contents + rel->r_offset); ++ contents, rel->r_offset); + wrel->r_offset = rel->r_offset; + wrel->r_info = 0; + wrel->r_addend = 0; +diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h +index e53b255dad..f6d9565f03 100644 +--- a/bfd/libbfd-in.h ++++ b/bfd/libbfd-in.h +@@ -696,8 +696,8 @@ extern bfd_reloc_status_type _bfd_relocate_contents + (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *) ATTRIBUTE_HIDDEN; + + /* Clear a given location using a given howto. */ +-extern void _bfd_clear_contents +- (reloc_howto_type *, bfd *, asection *, bfd_byte *) ATTRIBUTE_HIDDEN; ++extern bfd_reloc_status_type _bfd_clear_contents ++ (reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma) ATTRIBUTE_HIDDEN; + + /* Link stabs in sections in the first pass. */ + +diff --git a/bfd/libbfd.h b/bfd/libbfd.h +index a8851c8026..1189e63358 100644 +--- a/bfd/libbfd.h ++++ b/bfd/libbfd.h +@@ -701,8 +701,8 @@ extern bfd_reloc_status_type _bfd_relocate_contents + (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *) ATTRIBUTE_HIDDEN; + + /* Clear a given location using a given howto. */ +-extern void _bfd_clear_contents +- (reloc_howto_type *, bfd *, asection *, bfd_byte *) ATTRIBUTE_HIDDEN; ++extern bfd_reloc_status_type _bfd_clear_contents ++ (reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma) ATTRIBUTE_HIDDEN; + + /* Link stabs in sections in the first pass. */ + +diff --git a/bfd/reloc.c b/bfd/reloc.c +index 8dbb8896d3..1686780669 100644 +--- a/bfd/reloc.c ++++ b/bfd/reloc.c +@@ -1613,16 +1613,22 @@ _bfd_relocate_contents (reloc_howto_type *howto, + relocations against discarded symbols, to make ignorable debug or unwind + information more obvious. */ + +-void ++bfd_reloc_status_type + _bfd_clear_contents (reloc_howto_type *howto, + bfd *input_bfd, + asection *input_section, +- bfd_byte *location) ++ bfd_byte *buf, ++ bfd_vma off) + { + int size; + bfd_vma x = 0; ++ bfd_byte *location; ++ ++ if (!bfd_reloc_offset_in_range (howto, input_bfd, input_section, off)) ++ return bfd_reloc_outofrange; + + /* Get the value we are going to relocate. */ ++ location = buf + off; + size = bfd_get_reloc_size (howto); + switch (size) + { +@@ -1687,6 +1693,7 @@ _bfd_clear_contents (reloc_howto_type *howto, + #endif + break; + } ++ return bfd_reloc_ok; + } + + /* +@@ -8275,14 +8282,14 @@ bfd_generic_get_relocated_section_contents (bfd *abfd, + + if (symbol->section && discarded_section (symbol->section)) + { +- bfd_byte *p; ++ bfd_vma off; + static reloc_howto_type none_howto + = HOWTO (0, 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, + "unused", FALSE, 0, 0, FALSE); + +- p = data + (*parent)->address * bfd_octets_per_byte (input_bfd); +- _bfd_clear_contents ((*parent)->howto, input_bfd, input_section, +- p); ++ off = (*parent)->address * bfd_octets_per_byte (input_bfd); ++ _bfd_clear_contents ((*parent)->howto, input_bfd, ++ input_section, data, off); + (*parent)->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; + (*parent)->addend = 0; + (*parent)->howto = &none_howto; +-- +2.13.3 + diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch new file mode 100644 index 000000000..d6c706771 --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch @@ -0,0 +1,47 @@ +From ab419ddbb2cdd17ca83618990f2cacf904ce1d61 Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Tue, 23 Oct 2018 18:29:24 +1030 +Subject: [PATCH] PR23804, buffer overflow in sec_merge_hash_lookup + + PR 23804 + * merge.c (_bfd_add_merge_section): Don't attempt to merge + sections where size is not a multiple of entsize. + +Upstream-Status: Backport +CVE: CVE-2018-18605 +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + bfd/ChangeLog | 6 ++++++ + bfd/merge.c | 3 +++ + 2 files changed, 9 insertions(+) + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index 31ff3d6..da423b1 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,9 @@ ++2018-10-23 Alan Modra <amodra@gmail.com> ++ ++ PR 23804 ++ * merge.c (_bfd_add_merge_section): Don't attempt to merge ++ sections where size is not a multiple of entsize. ++ + 2018-10-13 Alan Modra <amodra@gmail.com> + + PR 23770 +diff --git a/bfd/merge.c b/bfd/merge.c +index 7904552..5e3bba0 100644 +--- a/bfd/merge.c ++++ b/bfd/merge.c +@@ -376,6 +376,9 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec, + || sec->entsize == 0) + return TRUE; + ++ if (sec->size % sec->entsize != 0) ++ return TRUE; ++ + if ((sec->flags & SEC_RELOC) != 0) + { + /* We aren't prepared to handle relocations in merged sections. */ +-- +2.9.3 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch new file mode 100644 index 000000000..35cf328a1 --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch @@ -0,0 +1,70 @@ +From 45a0eaf77022963d639d6d19871dbab7b79703fc Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Tue, 23 Oct 2018 19:02:06 +1030 +Subject: [PATCH] PR23806, NULL pointer dereference in merge_strings + + PR 23806 + * merge.c (_bfd_add_merge_section): Don't attempt to merge + sections with ridiculously large alignments. + +Upstream-Status: Backport +CVE: CVE-2018-18606 +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + bfd/ChangeLog | 6 ++++++ + bfd/merge.c | 15 +++++++++++---- + 2 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index 1f3fc1c..c5f7ec7 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,5 +1,11 @@ + 2018-10-23 Alan Modra <amodra@gmail.com> + ++ PR 23806 ++ * merge.c (_bfd_add_merge_section): Don't attempt to merge ++ sections with ridiculously large alignments. ++ ++2018-10-23 Alan Modra <amodra@gmail.com> ++ + PR 23804 + * merge.c (_bfd_add_merge_section): Don't attempt to merge + sections where size is not a multiple of entsize. +diff --git a/bfd/merge.c b/bfd/merge.c +index 5e3bba0..7de0c88 100644 +--- a/bfd/merge.c ++++ b/bfd/merge.c +@@ -24,6 +24,7 @@ + as used in ELF SHF_MERGE. */ + + #include "sysdep.h" ++#include <limits.h> + #include "bfd.h" + #include "elf-bfd.h" + #include "libbfd.h" +@@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec, + return TRUE; + } + +- align = sec->alignment_power; +- if ((sec->entsize < (unsigned) 1 << align ++#ifndef CHAR_BIT ++#define CHAR_BIT 8 ++#endif ++ if (sec->alignment_power >= sizeof (align) * CHAR_BIT) ++ return TRUE; ++ ++ align = 1u << sec->alignment_power; ++ if ((sec->entsize < align + && ((sec->entsize & (sec->entsize - 1)) + || !(sec->flags & SEC_STRINGS))) +- || (sec->entsize > (unsigned) 1 << align +- && (sec->entsize & (((unsigned) 1 << align) - 1)))) ++ || (sec->entsize > align ++ && (sec->entsize & (align - 1)))) + { + /* Sanity check. If string character size is smaller than + alignment, then we require character size to be a power +-- +2.9.3 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch new file mode 100644 index 000000000..38225d171 --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch @@ -0,0 +1,77 @@ +From 102def4da826b3d9e169741421e5e67e8731909a Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Tue, 23 Oct 2018 18:30:22 +1030 +Subject: [PATCH] PR23805, NULL pointer dereference in elf_link_input_bfd + + PR 23805 + * elflink.c (elf_link_input_bfd): Don't segfault on finding + STT_TLS symbols without any TLS sections. Instead, change the + symbol type to STT_NOTYPE. + +Upstream-Status: Backport +CVE: CVE-2018-18606 +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + bfd/ChangeLog | 7 +++++++ + bfd/elflink.c | 20 ++++++++++++++------ + 2 files changed, 21 insertions(+), 6 deletions(-) + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index da423b1..1f3fc1c 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,5 +1,12 @@ + 2018-10-23 Alan Modra <amodra@gmail.com> + ++ PR 23805 ++ * elflink.c (elf_link_input_bfd): Don't segfault on finding ++ STT_TLS symbols without any TLS sections. Instead, change the ++ symbol type to STT_NOTYPE. ++ ++2018-10-23 Alan Modra <amodra@gmail.com> ++ + PR 23806 + * merge.c (_bfd_add_merge_section): Don't attempt to merge + sections with ridiculously large alignments. +diff --git a/bfd/elflink.c b/bfd/elflink.c +index c3876cb..87440db 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -10489,8 +10489,11 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd) + if (ELF_ST_TYPE (osym.st_info) == STT_TLS) + { + /* STT_TLS symbols are relative to PT_TLS segment base. */ +- BFD_ASSERT (elf_hash_table (flinfo->info)->tls_sec != NULL); +- osym.st_value -= elf_hash_table (flinfo->info)->tls_sec->vma; ++ if (elf_hash_table (flinfo->info)->tls_sec != NULL) ++ osym.st_value -= elf_hash_table (flinfo->info)->tls_sec->vma; ++ else ++ osym.st_info = ELF_ST_INFO (ELF_ST_BIND (osym.st_info), ++ STT_NOTYPE); + } + } + +@@ -11046,12 +11049,17 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd) + sym.st_value += osec->vma; + if (ELF_ST_TYPE (sym.st_info) == STT_TLS) + { ++ struct elf_link_hash_table *htab ++ = elf_hash_table (flinfo->info); ++ + /* STT_TLS symbols are relative to PT_TLS + segment base. */ +- BFD_ASSERT (elf_hash_table (flinfo->info) +- ->tls_sec != NULL); +- sym.st_value -= (elf_hash_table (flinfo->info) +- ->tls_sec->vma); ++ if (htab->tls_sec != NULL) ++ sym.st_value -= htab->tls_sec->vma; ++ else ++ sym.st_info ++ = ELF_ST_INFO (ELF_ST_BIND (sym.st_info), ++ STT_NOTYPE); + } + } + +-- +2.9.3 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-6759.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-6759.patch deleted file mode 100644 index fff497942..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-6759.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 64e234d417d5685a4aec0edc618114d9991c031b Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Tue, 6 Feb 2018 15:48:29 +0000 -Subject: [PATCH] Prevent attempts to call strncpy with a zero-length field by - chacking the size of debuglink sections. - - PR 22794 - * opncls.c (bfd_get_debug_link_info_1): Check the size of the - section before attempting to read it in. - (bfd_get_alt_debug_link_info): Likewise. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-6759 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - bfd/ChangeLog | 7 +++++++ - bfd/opncls.c | 22 +++++++++++++++++----- - 2 files changed, 24 insertions(+), 5 deletions(-) - -Index: git/bfd/opncls.c -=================================================================== ---- git.orig/bfd/opncls.c -+++ git/bfd/opncls.c -@@ -1179,6 +1179,7 @@ bfd_get_debug_link_info_1 (bfd *abfd, vo - bfd_byte *contents; - unsigned int crc_offset; - char *name; -+ bfd_size_type size; - - BFD_ASSERT (abfd); - BFD_ASSERT (crc32_out); -@@ -1188,6 +1189,12 @@ bfd_get_debug_link_info_1 (bfd *abfd, vo - if (sect == NULL) - return NULL; - -+ size = bfd_get_section_size (sect); -+ -+ /* PR 22794: Make sure that the section has a reasonable size. */ -+ if (size < 8 || size >= bfd_get_size (abfd)) -+ return NULL; -+ - if (!bfd_malloc_and_get_section (abfd, sect, &contents)) - { - if (contents != NULL) -@@ -1197,10 +1204,10 @@ bfd_get_debug_link_info_1 (bfd *abfd, vo - - /* CRC value is stored after the filename, aligned up to 4 bytes. */ - name = (char *) contents; -- /* PR 17597: avoid reading off the end of the buffer. */ -- crc_offset = strnlen (name, bfd_get_section_size (sect)) + 1; -+ /* PR 17597: Avoid reading off the end of the buffer. */ -+ crc_offset = strnlen (name, size) + 1; - crc_offset = (crc_offset + 3) & ~3; -- if (crc_offset + 4 > bfd_get_section_size (sect)) -+ if (crc_offset + 4 > size) - return NULL; - - *crc32 = bfd_get_32 (abfd, contents + crc_offset); -@@ -1261,6 +1268,7 @@ bfd_get_alt_debug_link_info (bfd * abfd, - bfd_byte *contents; - unsigned int buildid_offset; - char *name; -+ bfd_size_type size; - - BFD_ASSERT (abfd); - BFD_ASSERT (buildid_len); -@@ -1271,6 +1279,10 @@ bfd_get_alt_debug_link_info (bfd * abfd, - if (sect == NULL) - return NULL; - -+ size = bfd_get_section_size (sect); -+ if (size < 8 || size >= bfd_get_size (abfd)) -+ return NULL; -+ - if (!bfd_malloc_and_get_section (abfd, sect, & contents)) - { - if (contents != NULL) -@@ -1280,11 +1292,11 @@ bfd_get_alt_debug_link_info (bfd * abfd, - - /* BuildID value is stored after the filename. */ - name = (char *) contents; -- buildid_offset = strnlen (name, bfd_get_section_size (sect)) + 1; -+ buildid_offset = strnlen (name, size) + 1; - if (buildid_offset >= bfd_get_section_size (sect)) - return NULL; - -- *buildid_len = bfd_get_section_size (sect) - buildid_offset; -+ *buildid_len = size - buildid_offset; - *buildid_out = bfd_malloc (*buildid_len); - memcpy (*buildid_out, contents + buildid_offset, *buildid_len); - -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,3 +1,10 @@ -+2018-02-06 Nick Clifton <nickc@redhat.com> -+ -+ PR 22794 -+ * opncls.c (bfd_get_debug_link_info_1): Check the size of the -+ section before attempting to read it in. -+ (bfd_get_alt_debug_link_info): Likewise. -+ - 2018-02-09 Nick Clifton <nickc@redhat.com> - - Import patch from mainline: diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-6872.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-6872.patch deleted file mode 100644 index 2ef36c232..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-6872.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d895ef77ffc94e02e748856c2ab54f5bb8cc867e Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Fri, 9 Feb 2018 09:28:45 +0000 -Subject: [PATCH] Import patch from mainline to fix possible seg-fault whilst - parsing corrupt ELF notes with extravagent alignments. - - PR 22788 - * elf.c (elf_parse_notes): Reject notes with excessuively large - alignments. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-6872 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - bfd/ChangeLog | 9 +++++++++ - bfd/elf.c | 2 ++ - 2 files changed, 11 insertions(+) - -Index: git/bfd/elf.c -=================================================================== ---- git.orig/bfd/elf.c -+++ git/bfd/elf.c -@@ -11020,6 +11020,8 @@ elf_parse_notes (bfd *abfd, char *buf, s - align is less than 4, we use 4 byte alignment. */ - if (align < 4) - align = 4; -+ if (align != 4 && align != 8) -+ return FALSE; - - p = buf; - while (p < buf + size) -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,3 +1,12 @@ -+2018-02-09 Nick Clifton <nickc@redhat.com> -+ -+ Import patch from mainline: -+ 2018-02-08 Nick Clifton <nickc@redhat.com> -+ -+ PR 22788 -+ * elf.c (elf_parse_notes): Reject notes with excessuively large -+ alignments. -+ - 2018-03-01 Nick Clifton <nickc@redhat.com> - - PR 22905 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7208.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7208.patch deleted file mode 100644 index 8efefebc2..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7208.patch +++ /dev/null @@ -1,47 +0,0 @@ -From eb77f6a4621795367a39cdd30957903af9dbb815 Mon Sep 17 00:00:00 2001 -From: Alan Modra <amodra@gmail.com> -Date: Sat, 27 Jan 2018 08:19:33 +1030 -Subject: [PATCH] PR22741, objcopy segfault on fuzzed COFF object - - PR 22741 - * coffgen.c (coff_pointerize_aux): Ensure auxent tagndx is in - range before converting to a symbol table pointer. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-7208 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - bfd/ChangeLog | 6 ++++++ - bfd/coffgen.c | 3 ++- - 2 files changed, 8 insertions(+), 1 deletion(-) - -Index: git/bfd/coffgen.c -=================================================================== ---- git.orig/bfd/coffgen.c -+++ git/bfd/coffgen.c -@@ -1555,7 +1555,8 @@ coff_pointerize_aux (bfd *abfd, - } - /* A negative tagndx is meaningless, but the SCO 3.2v4 cc can - generate one, so we must be careful to ignore it. */ -- if (auxent->u.auxent.x_sym.x_tagndx.l > 0) -+ if ((unsigned long) auxent->u.auxent.x_sym.x_tagndx.l -+ < obj_raw_syment_count (abfd)) - { - auxent->u.auxent.x_sym.x_tagndx.p = - table_base + auxent->u.auxent.x_sym.x_tagndx.l; -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,3 +1,9 @@ -+2018-01-29 Alan Modra <amodra@gmail.com> -+ -+ PR 22741 -+ * coffgen.c (coff_pointerize_aux): Ensure auxent tagndx is in -+ range before converting to a symbol table pointer. -+ - 2018-02-28 Alan Modra <amodra@gmail.com> - - PR 22887 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7568.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7568.patch deleted file mode 100644 index 815b32c30..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7568.patch +++ /dev/null @@ -1,85 +0,0 @@ -From eef104664efb52965d85a28bc3fc7c77e52e48e2 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Wed, 28 Feb 2018 10:13:54 +0000 -Subject: [PATCH] Fix potential integer overflow when reading corrupt dwarf1 - debug information. - - PR 22894 - * dwarf1.c (parse_die): Check the length of form blocks before - advancing the data pointer. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-7568 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - bfd/ChangeLog | 6 ++++++ - bfd/dwarf1.c | 17 +++++++++++++++-- - 2 files changed, 21 insertions(+), 2 deletions(-) - -Index: git/bfd/dwarf1.c -=================================================================== ---- git.orig/bfd/dwarf1.c -+++ git/bfd/dwarf1.c -@@ -213,6 +213,7 @@ parse_die (bfd * abfd, - /* Then the attributes. */ - while (xptr + 2 <= aDiePtrEnd) - { -+ unsigned int block_len; - unsigned short attr; - - /* Parse the attribute based on its form. This section -@@ -255,12 +256,24 @@ parse_die (bfd * abfd, - break; - case FORM_BLOCK2: - if (xptr + 2 <= aDiePtrEnd) -- xptr += bfd_get_16 (abfd, xptr); -+ { -+ block_len = bfd_get_16 (abfd, xptr); -+ if (xptr + block_len > aDiePtrEnd -+ || xptr + block_len < xptr) -+ return FALSE; -+ xptr += block_len; -+ } - xptr += 2; - break; - case FORM_BLOCK4: - if (xptr + 4 <= aDiePtrEnd) -- xptr += bfd_get_32 (abfd, xptr); -+ { -+ block_len = bfd_get_32 (abfd, xptr); -+ if (xptr + block_len > aDiePtrEnd -+ || xptr + block_len < xptr) -+ return FALSE; -+ xptr += block_len; -+ } - xptr += 4; - break; - case FORM_STRING: -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -4,7 +4,11 @@ - * coffgen.c (coff_pointerize_aux): Ensure auxent tagndx is in - range before converting to a symbol table pointer. - --2018-02-28 Alan Modra <amodra@gmail.com> -+2018-02-28 Nick Clifton <nickc@redhat.com> -+ -+ PR 22894 -+ * dwarf1.c (parse_die): Check the length of form blocks before -+ advancing the data pointer. - - PR 22895 - PR 22893 -@@ -14,6 +18,8 @@ - size is invalid. - (read_attribute_value): Adjust invocations of read_n_bytes. - -+2018-02-28 Alan Modra <amodra@gmail.com> -+ - PR 22887 - * aoutx.h (swap_std_reloc_in): Correct r_index bound check. - diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7569.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7569.patch deleted file mode 100644 index 96c0fd242..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7569.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 12c963421d045a127c413a0722062b9932c50aa9 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Wed, 28 Feb 2018 11:50:49 +0000 -Subject: [PATCH] Catch integer overflows/underflows when parsing corrupt DWARF - FORM blocks. - - PR 22895 - PR 22893 - * dwarf2.c (read_n_bytes): Replace size parameter with dwarf_block - pointer. Drop unused abfd parameter. Check the size of the block - before initialising the data field. Return the end pointer if the - size is invalid. - (read_attribute_value): Adjust invocations of read_n_bytes. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-7569 -Signed-off-by: Armin Kuster <akuster@mvista.com> ---- - bfd/ChangeLog | 8 ++++++++ - bfd/dwarf2.c | 36 +++++++++++++++++++++--------------- - 2 files changed, 29 insertions(+), 15 deletions(-) - -Index: git/bfd/dwarf2.c -=================================================================== ---- git.orig/bfd/dwarf2.c -+++ git/bfd/dwarf2.c -@@ -622,14 +622,24 @@ read_8_bytes (bfd *abfd, bfd_byte *buf, - } - - static bfd_byte * --read_n_bytes (bfd *abfd ATTRIBUTE_UNUSED, -- bfd_byte *buf, -- bfd_byte *end, -- unsigned int size ATTRIBUTE_UNUSED) --{ -- if (buf + size > end) -- return NULL; -- return buf; -+read_n_bytes (bfd_byte * buf, -+ bfd_byte * end, -+ struct dwarf_block * block) -+{ -+ unsigned int size = block->size; -+ bfd_byte * block_end = buf + size; -+ -+ if (block_end > end || block_end < buf) -+ { -+ block->data = NULL; -+ block->size = 0; -+ return end; -+ } -+ else -+ { -+ block->data = buf; -+ return block_end; -+ } - } - - /* Scans a NUL terminated string starting at BUF, returning a pointer to it. -@@ -1127,8 +1137,7 @@ read_attribute_value (struct attribute * - return NULL; - blk->size = read_2_bytes (abfd, info_ptr, info_ptr_end); - info_ptr += 2; -- blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size); -- info_ptr += blk->size; -+ info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); - attr->u.blk = blk; - break; - case DW_FORM_block4: -@@ -1138,8 +1147,7 @@ read_attribute_value (struct attribute * - return NULL; - blk->size = read_4_bytes (abfd, info_ptr, info_ptr_end); - info_ptr += 4; -- blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size); -- info_ptr += blk->size; -+ info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); - attr->u.blk = blk; - break; - case DW_FORM_data2: -@@ -1179,8 +1187,7 @@ read_attribute_value (struct attribute * - blk->size = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read, - FALSE, info_ptr_end); - info_ptr += bytes_read; -- blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size); -- info_ptr += blk->size; -+ info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); - attr->u.blk = blk; - break; - case DW_FORM_block1: -@@ -1190,8 +1197,7 @@ read_attribute_value (struct attribute * - return NULL; - blk->size = read_1_byte (abfd, info_ptr, info_ptr_end); - info_ptr += 1; -- blk->data = read_n_bytes (abfd, info_ptr, info_ptr_end, blk->size); -- info_ptr += blk->size; -+ info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); - attr->u.blk = blk; - break; - case DW_FORM_data1: -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -6,6 +6,14 @@ - - 2018-02-28 Alan Modra <amodra@gmail.com> - -+ PR 22895 -+ PR 22893 -+ * dwarf2.c (read_n_bytes): Replace size parameter with dwarf_block -+ pointer. Drop unused abfd parameter. Check the size of the block -+ before initialising the data field. Return the end pointer if the -+ size is invalid. -+ (read_attribute_value): Adjust invocations of read_n_bytes. -+ - PR 22887 - * aoutx.h (swap_std_reloc_in): Correct r_index bound check. - diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7642.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7642.patch deleted file mode 100644 index 9def46cf5..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7642.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 116acb2c268c89c89186673a7c92620d21825b25 Mon Sep 17 00:00:00 2001 -From: Alan Modra <amodra@gmail.com> -Date: Wed, 28 Feb 2018 22:09:50 +1030 -Subject: [PATCH] PR22887, null pointer dereference in - aout_32_swap_std_reloc_out - - PR 22887 - * aoutx.h (swap_std_reloc_in): Correct r_index bound check. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-7642 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - bfd/ChangeLog | 5 +++++ - bfd/aoutx.h | 6 ++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -Index: git/bfd/aoutx.h -=================================================================== ---- git.orig/bfd/aoutx.h -+++ git/bfd/aoutx.h -@@ -2284,10 +2284,12 @@ NAME (aout, swap_std_reloc_in) (bfd *abf - if (r_baserel) - r_extern = 1; - -- if (r_extern && r_index > symcount) -+ if (r_extern && r_index >= symcount) - { - /* We could arrange to return an error, but it might be useful -- to see the file even if it is bad. */ -+ to see the file even if it is bad. FIXME: Of course this -+ means that objdump -r *doesn't* see the actual reloc, and -+ objcopy silently writes a different reloc. */ - r_extern = 0; - r_index = N_ABS; - } -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,3 +1,8 @@ -+2018-02-28 Alan Modra <amodra@gmail.com> -+ -+ PR 22887 -+ * aoutx.h (swap_std_reloc_in): Correct r_index bound check. -+ - 2018-02-06 Nick Clifton <nickc@redhat.com> - - PR 22794 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7643.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7643.patch deleted file mode 100644 index 2a2dec3a4..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-7643.patch +++ /dev/null @@ -1,102 +0,0 @@ -From d11ae95ea3403559f052903ab053f43ad7821e37 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Thu, 1 Mar 2018 16:14:08 +0000 -Subject: [PATCH] Prevent illegal memory accesses triggerd by intger overflow - when parsing corrupt DWARF information on a 32-bit host. - - PR 22905 - * dwarf.c (display_debug_ranges): Check that the offset loaded - from the range_entry structure is valid. - -Upstream-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-7643 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - binutils/ChangeLog | 6 ++++++ - binutils/dwarf.c | 15 +++++++++++++++ - 2 files changed, 21 insertions(+) - -Index: git/binutils/dwarf.c -=================================================================== ---- git.orig/binutils/dwarf.c -+++ git/binutils/dwarf.c -@@ -387,6 +387,9 @@ read_uleb128 (unsigned char * data, - } \ - while (0) - -+/* Read AMOUNT bytes from PTR and store them in VAL as an unsigned value. -+ Checks to make sure that the read will not reach or pass END -+ and that VAL is big enough to hold AMOUNT bytes. */ - #define SAFE_BYTE_GET(VAL, PTR, AMOUNT, END) \ - do \ - { \ -@@ -415,6 +418,7 @@ read_uleb128 (unsigned char * data, - } \ - while (0) - -+/* Like SAFE_BYTE_GET, but also increments PTR by AMOUNT. */ - #define SAFE_BYTE_GET_AND_INC(VAL, PTR, AMOUNT, END) \ - do \ - { \ -@@ -423,6 +427,7 @@ read_uleb128 (unsigned char * data, - } \ - while (0) - -+/* Like SAFE_BYTE_GET, but reads a signed value. */ - #define SAFE_SIGNED_BYTE_GET(VAL, PTR, AMOUNT, END) \ - do \ - { \ -@@ -441,6 +446,7 @@ read_uleb128 (unsigned char * data, - } \ - while (0) - -+/* Like SAFE_SIGNED_BYTE_GET, but also increments PTR by AMOUNT. */ - #define SAFE_SIGNED_BYTE_GET_AND_INC(VAL, PTR, AMOUNT, END) \ - do \ - { \ -@@ -6543,6 +6549,7 @@ display_debug_ranges_list (unsigned char - break; - SAFE_SIGNED_BYTE_GET_AND_INC (end, start, pointer_size, finish); - -+ - printf (" %8.8lx ", offset); - - if (begin == 0 && end == 0) -@@ -6810,6 +6817,13 @@ display_debug_ranges (struct dwarf_secti - continue; - } - -+ if (next < section_begin || next >= finish) -+ { -+ warn (_("Corrupt offset (%#8.8lx) in range entry %u\n"), -+ (unsigned long) offset, i); -+ continue; -+ } -+ - if (dwarf_check != 0 && i > 0) - { - if (start < next) -@@ -6825,6 +6839,7 @@ display_debug_ranges (struct dwarf_secti - (unsigned long) (next - section_begin), section->name); - } - } -+ - start = next; - last_start = next; - -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,3 +1,9 @@ -+2018-03-01 Nick Clifton <nickc@redhat.com> -+ -+ PR 22905 -+ * dwarf.c (display_debug_ranges): Check that the offset loaded -+ from the range_entry structure is valid. -+ - 2018-05-08 Nick Clifton <nickc@redhat.com> - - PR 22809 diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-8945.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-8945.patch deleted file mode 100644 index 6a43168b8..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-8945.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 95a6d23566165208853a68d9cd3c6eedca840ec6 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Tue, 8 May 2018 12:51:06 +0100 -Subject: [PATCH] Prevent a memory exhaustion failure when running objdump on a - fuzzed input file with corrupt string and attribute sections. - - PR 22809 - * elf.c (bfd_elf_get_str_section): Check for an excessively large - string section. - * elf-attrs.c (_bfd_elf_parse_attributes): Issue an error if the - attribute section is larger than the size of the file. - -Upsteram-Status: Backport -Affects: Binutils <= 2.30 -CVE: CVE-2018-8945 -Signed-off-by: Armin kuster <akuster@mvista.com> ---- - bfd/ChangeLog | 8 ++++++++ - bfd/elf-attrs.c | 9 +++++++++ - bfd/elf.c | 1 + - 3 files changed, 18 insertions(+) - -Index: git/bfd/elf-attrs.c -=================================================================== ---- git.orig/bfd/elf-attrs.c -+++ git/bfd/elf-attrs.c -@@ -438,6 +438,15 @@ _bfd_elf_parse_attributes (bfd *abfd, El - /* PR 17512: file: 2844a11d. */ - if (hdr->sh_size == 0) - return; -+ if (hdr->sh_size > bfd_get_file_size (abfd)) -+ { -+ /* xgettext:c-format */ -+ _bfd_error_handler (_("%pB: error: attribute section '%pA' too big: %#llx"), -+ abfd, hdr->bfd_section, (long long) hdr->sh_size); -+ bfd_set_error (bfd_error_invalid_operation); -+ return; -+ } -+ - contents = (bfd_byte *) bfd_malloc (hdr->sh_size + 1); - if (!contents) - return; -Index: git/bfd/elf.c -=================================================================== ---- git.orig/bfd/elf.c -+++ git/bfd/elf.c -@@ -298,6 +298,7 @@ bfd_elf_get_str_section (bfd *abfd, unsi - /* Allocate and clear an extra byte at the end, to prevent crashes - in case the string table is not terminated. */ - if (shstrtabsize + 1 <= 1 -+ || shstrtabsize > bfd_get_file_size (abfd) - || bfd_seek (abfd, offset, SEEK_SET) != 0 - || (shstrtab = (bfd_byte *) bfd_alloc (abfd, shstrtabsize + 1)) == NULL) - shstrtab = NULL; -Index: git/bfd/ChangeLog -=================================================================== ---- git.orig/bfd/ChangeLog -+++ git/bfd/ChangeLog -@@ -1,3 +1,11 @@ -+2018-05-08 Nick Clifton <nickc@redhat.com> -+ -+ PR 22809 -+ * elf.c (bfd_elf_get_str_section): Check for an excessively large -+ string section. -+ * elf-attrs.c (_bfd_elf_parse_attributes): Issue an error if the -+ attribute section is larger than the size of the file. -+ - 2018-02-07 Alan Modra <amodra@gmail.com> - - Revert 2018-01-17 Alan Modra <amodra@gmail.com> diff --git a/poky/meta/recipes-devtools/binutils/binutils_2.30.bb b/poky/meta/recipes-devtools/binutils/binutils_2.31.bb index 51a974890..51a974890 100644 --- a/poky/meta/recipes-devtools/binutils/binutils_2.30.bb +++ b/poky/meta/recipes-devtools/binutils/binutils_2.31.bb |