diff options
21 files changed, 1318 insertions, 1206 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index cb17061706..24a21b5837 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "8.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.30%" +BINUVERSION ?= "2.31%" GDBVERSION ?= "8.1%" GLIBCVERSION ?= "2.27%" LINUXLIBCVERSION ?= "4.15%" diff --git a/meta/recipes-devtools/binutils/binutils-2.30.inc b/meta/recipes-devtools/binutils/binutils-2.31.inc index 9c883acc52..ec9e9c330d 100644 --- a/meta/recipes-devtools/binutils/binutils-2.30.inc +++ b/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 ?= "f8b4d71490df766ca9c474f7ab9c82b3a8029a5a" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb index 5dbaa03017..5dbaa03017 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.30.bb b/meta/recipes-devtools/binutils/binutils-cross_2.31.bb index fbd1f7d25a..fbd1f7d25a 100644 --- a/meta/recipes-devtools/binutils/binutils-cross_2.30.bb +++ b/meta/recipes-devtools/binutils/binutils-cross_2.31.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb index 37f4d6d2e9..37f4d6d2e9 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 2df836057d..6bdb407b1e 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/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/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index bac7fb2d1a..0208213832 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -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/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch index 306afe7018..15193c10a6 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ b/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/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch index 3e29c5815a..bf1c1be27d 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/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/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 2f49969371..1f589718ed 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,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/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch index 333e2ee176..8550df0cb0 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +++ b/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 +@@ -8 |