summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-08-10 07:38:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 00:03:13 +0100
commit00ea0bf798e12ebf2323a85a63b7497892a2fba4 (patch)
treec511c3c3f9a4d225459204d87b2132cf3b188e84 /meta
parent034bff2ca431b49b7ca9b1e7b7c214ef94b0eb34 (diff)
downloadpoky-00ea0bf798e12ebf2323a85a63b7497892a2fba4.tar.gz
binutils: Upgrade to 2.29
(From OE-Core rev: 3bf990eb275f63190a2cf7253527d6d49fd93f1a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.29.inc (renamed from meta/recipes-devtools/binutils/binutils-2.28.inc)29
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.29.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.28.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.29.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.28.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.29.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.28.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch47
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch20
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch (renamed from meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch)504
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch (renamed from meta/recipes-devtools/binutils/binutils/0008-Add-the-armv5e-architecture-to-binutils.patch)10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch (renamed from meta/recipes-devtools/binutils/binutils/0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch)10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch (renamed from meta/recipes-devtools/binutils/binutils/0010-warn-for-uses-of-system-directories-when-cross-linki.patch)58
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch (renamed from meta/recipes-devtools/binutils/binutils/0011-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch)6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch (renamed from meta/recipes-devtools/binutils/binutils/0012-Change-default-emulation-for-mips64-linux.patch)14
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch (renamed from meta/recipes-devtools/binutils/binutils/0013-Add-support-for-Netlogic-XLP.patch)134
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch (renamed from meta/recipes-devtools/binutils/binutils/0014-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch)12
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch (renamed from meta/recipes-devtools/binutils/binutils/0016-Detect-64-bit-MIPS-targets.patch)6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0017-bfd-Improve-lookup-of-file-line-information-for-erro.patch75
-rw-r--r--meta/recipes-devtools/binutils/binutils/0018-PR-21409-segfault-in-_bfd_dwarf2_find_nearest_line.patch33
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch109
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch221
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2017-6969.patch43
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2017-6969_2.patch104
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2017-7209.patch48
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2017-7210.patch56
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.29.bb (renamed from meta/recipes-devtools/binutils/binutils_2.28.bb)0
29 files changed, 471 insertions, 1094 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 2754136405..4a820a0939 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"
24 24
25GCCVERSION ?= "7.%" 25GCCVERSION ?= "7.%"
26SDKGCCVERSION ?= "${GCCVERSION}" 26SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.28%" 27BINUVERSION ?= "2.29%"
28GDBVERSION ?= "8.0%" 28GDBVERSION ?= "8.0%"
29GLIBCVERSION ?= "2.26%" 29GLIBCVERSION ?= "2.26%"
30LINUXLIBCVERSION ?= "4.10%" 30LINUXLIBCVERSION ?= "4.10%"
diff --git a/meta/recipes-devtools/binutils/binutils-2.28.inc b/meta/recipes-devtools/binutils/binutils-2.29.inc
index 477bcb2564..8e38093946 100644
--- a/meta/recipes-devtools/binutils/binutils-2.28.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.29.inc
@@ -18,29 +18,22 @@ BINUPV = "${@binutils_branch_version(d)}"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20 20
21SRCREV = "7ea1464297eadebe62aae92ad9bebb33f92c2454" 21SRCREV = "dd241688aee3712803a917315df089f4c714b5ef"
22SRC_URI = "\ 22SRC_URI = "\
23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \ 23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
24 file://0003-configure-widen-the-regexp-for-SH-architectures.patch \
24 file://0004-Point-scripts-location-to-libdir.patch \ 25 file://0004-Point-scripts-location-to-libdir.patch \
25 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ 26 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
26 file://0007-Use-libtool-2.4.patch \ 27 file://0006-Use-libtool-2.4.patch \
27 file://0008-Add-the-armv5e-architecture-to-binutils.patch \ 28 file://0007-Add-the-armv5e-architecture-to-binutils.patch \
28 file://0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ 29 file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
29 file://0010-warn-for-uses-of-system-directories-when-cross-linki.patch \ 30 file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \
30 file://0011-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ 31 file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
31 file://0012-Change-default-emulation-for-mips64-linux.patch \ 32 file://0011-Change-default-emulation-for-mips64-linux.patch \
32 file://0013-Add-support-for-Netlogic-XLP.patch \ 33 file://0012-Add-support-for-Netlogic-XLP.patch \
33 file://0014-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ 34 file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
35 file://0014-Detect-64-bit-MIPS-targets.patch \
34 file://0015-sync-with-OE-libtool-changes.patch \ 36 file://0015-sync-with-OE-libtool-changes.patch \
35 file://0016-Detect-64-bit-MIPS-targets.patch \
36 file://CVE-2017-6965.patch \
37 file://CVE-2017-6966.patch \
38 file://0017-bfd-Improve-lookup-of-file-line-information-for-erro.patch \
39 file://0018-PR-21409-segfault-in-_bfd_dwarf2_find_nearest_line.patch \
40 file://CVE-2017-6969.patch \
41 file://CVE-2017-6969_2.patch \
42 file://CVE-2017-7209.patch \
43 file://CVE-2017-7210.patch \
44" 37"
45S = "${WORKDIR}/git" 38S = "${WORKDIR}/git"
46 39
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.28.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.29.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.28.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.29.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.28.bb b/meta/recipes-devtools/binutils/binutils-cross_2.29.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.28.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.29.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.28.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.29.bb
index 37f4d6d2e9..37f4d6d2e9 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.28.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.29.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 8fb1b4edea..0b515d83c7 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 @@
1From 689d011688b5ff9481d4367bef3dea7a7b2867fb Mon Sep 17 00:00:00 2001 1From 58ac9f95a3d83c29efaf7a8906fb6aefea8c8e79 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:58:54 +0000 3Date: Mon, 2 Mar 2015 01:58:54 +0000
4Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs
@@ -43,7 +43,7 @@ index b6940d376d..a42c4d7a4b 100755
43 LD_FLAG= 43 LD_FLAG=
44 DATA_ALIGNMENT=${DATA_ALIGNMENT_} 44 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
45diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc 45diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
46index e65f9a3ccf..d99d2c1d2a 100644 46index d9138bc059..e48faeca43 100644
47--- a/ld/scripttempl/elf.sc 47--- a/ld/scripttempl/elf.sc
48+++ b/ld/scripttempl/elf.sc 48+++ b/ld/scripttempl/elf.sc
49@@ -138,8 +138,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then 49@@ -138,8 +138,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
@@ -58,5 +58,5 @@ index e65f9a3ccf..d99d2c1d2a 100644
58 if test -z "$PLT"; then 58 if test -z "$PLT"; then
59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" 59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"
60-- 60--
612.12.0 612.14.0
62 62
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 14299fd1ae..370333d5d0 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 @@
1From 7c7de107b4b0a507d2aeca3e3a86d01cb4b51360 Mon Sep 17 00:00:00 2001 1From 8f929c616208351d0971d7dfd7574d48d3144603 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:37:05 -0800 3Date: Mon, 6 Mar 2017 23:37:05 -0800
4Subject: [PATCH 02/15] binutils-cross: Do not generate linker script 4Subject: [PATCH 02/15] binutils-cross: Do not generate linker script
@@ -57,5 +57,5 @@ index a42c4d7a4b..d727b4d07e 100755
57 libs=${NATIVE_LIB_DIRS} 57 libs=${NATIVE_LIB_DIRS}
58 if [ "x${NATIVE}" = "xyes" ] ; then 58 if [ "x${NATIVE}" = "xyes" ] ; then
59-- 59--
602.12.0 602.14.0
61 61
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
new file mode 100644
index 0000000000..b6c09ccf19
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
@@ -0,0 +1,47 @@
1From e5a806aae02a10290c71deb72f6294c98068368d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:07:33 +0000
4Subject: [PATCH 03/15] configure: widen the regexp for SH architectures
5
6gprof needs to know about uclibc
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure | 2 +-
13 gprof/configure | 5 +++++
14 2 files changed, 6 insertions(+), 1 deletion(-)
15
16diff --git a/configure b/configure
17index be9dd89d9b..d8af155ab5 100755
18--- a/configure
19+++ b/configure
20@@ -3844,7 +3844,7 @@ case "${target}" in
21 or1k*-*-*)
22 noconfigdirs="$noconfigdirs gdb"
23 ;;
24- sh-*-*)
25+ sh*-*-* | sh64-*-*)
26 case "${target}" in
27 sh*-*-elf)
28 ;;
29diff --git a/gprof/configure b/gprof/configure
30index e71fe8b9e4..679e0dce77 100755
31--- a/gprof/configure
32+++ b/gprof/configure
33@@ -5874,6 +5874,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
34 lt_cv_deplibs_check_method=pass_all
35 ;;
36
37+linux-uclibc*)
38+ lt_cv_deplibs_check_method=pass_all
39+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
40+ ;;
41+
42 netbsd*)
43 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
44 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
45--
462.14.0
47
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 c6b9de7991..38eee30855 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 @@
1From e34650c50574a8a39d694567ed607a63006b6f99 Mon Sep 17 00:00:00 2001 1From 3634ec3547bc0f8a5d1b8ad15365e2f836cda642 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000 3Date: Mon, 2 Mar 2015 01:09:58 +0000
4Subject: [PATCH 04/15] Point scripts location to libdir 4Subject: [PATCH 04/15] Point scripts location to libdir
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/ld/Makefile.am b/ld/Makefile.am 14diff --git a/ld/Makefile.am b/ld/Makefile.am
15index 15beaa7021..bbf9c671d8 100644 15index 625347ff62..d5334d2681 100644
16--- a/ld/Makefile.am 16--- a/ld/Makefile.am
17+++ b/ld/Makefile.am 17+++ b/ld/Makefile.am
18@@ -57,7 +57,7 @@ endif 18@@ -57,7 +57,7 @@ endif
@@ -25,10 +25,10 @@ index 15beaa7021..bbf9c671d8 100644
25 EMUL = @EMUL@ 25 EMUL = @EMUL@
26 EMULATION_OFILES = @EMULATION_OFILES@ 26 EMULATION_OFILES = @EMULATION_OFILES@
27diff --git a/ld/Makefile.in b/ld/Makefile.in 27diff --git a/ld/Makefile.in b/ld/Makefile.in
28index 042b690ed6..37e7b25e9a 100644 28index ba251777b0..a2cf2282b5 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -452,7 +452,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
32 # We put the scripts in the directory $(scriptdir)/ldscripts. 32 # We put the scripts in the directory $(scriptdir)/ldscripts.
33 # We can't put the scripts in $(datadir) because the SEARCH_DIR 33 # We can't put the scripts in $(datadir) because the SEARCH_DIR
34 # directives need to be different for native and cross linkers. 34 # directives need to be different for native and cross linkers.
@@ -38,5 +38,5 @@ index 042b690ed6..37e7b25e9a 100644
38 BFDDIR = $(BASEDIR)/bfd 38 BFDDIR = $(BASEDIR)/bfd
39 INCDIR = $(BASEDIR)/include 39 INCDIR = $(BASEDIR)/include
40-- 40--
412.12.0 412.14.0
42 42
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 726f7020dd..59150a2e4d 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 @@
1From 42292f5533bca904f230a8e03ceee1f84ef0c4ec Mon Sep 17 00:00:00 2001 1From 9d37c8f68c07da63186cb993f1221f6c11eca422 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:27:17 +0000 3Date: Mon, 2 Mar 2015 01:27:17 +0000
4Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not 4Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not
@@ -15,19 +15,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
16 16
17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em 17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
18index 84adaef6df..ab8c74257e 100644 18index 9ac1840316..9dc4c149bc 100644
19--- a/ld/emultempl/elf32.em 19--- a/ld/emultempl/elf32.em
20+++ b/ld/emultempl/elf32.em 20+++ b/ld/emultempl/elf32.em
21@@ -1411,6 +1411,8 @@ fragment <<EOF 21@@ -1463,6 +1463,8 @@ fragment <<EOF
22 && command_line.rpath == NULL) 22 && command_line.rpath == NULL)
23 { 23 {
24 lib_path = (const char *) getenv ("LD_RUN_PATH"); 24 path = (const char *) getenv ("LD_RUN_PATH");
25+ if ((lib_path) && (strlen (lib_path) == 0)) 25+ if ((path) && (strlen (path) == 0))
26+ lib_path = NULL; 26+ path = NULL;
27 if (gld${EMULATION_NAME}_search_needed (lib_path, &n, 27 if (path
28 force)) 28 && gld${EMULATION_NAME}_search_needed (path, &n, force))
29 break; 29 break;
30@@ -1692,6 +1694,8 @@ gld${EMULATION_NAME}_before_allocation (void) 30@@ -1740,6 +1742,8 @@ gld${EMULATION_NAME}_before_allocation (void)
31 rpath = command_line.rpath; 31 rpath = command_line.rpath;
32 if (rpath == NULL) 32 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH"); 33 rpath = (const char *) getenv ("LD_RUN_PATH");
@@ -37,5 +37,5 @@ index 84adaef6df..ab8c74257e 100644
37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) 37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) 38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
39-- 39--
402.12.0 402.14.0
41 41
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
index 4f0ef101db..e87efe653b 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
@@ -1,17 +1,18 @@
1From 9a3651e120261c72090689ad770ad048b0baf506 Mon Sep 17 00:00:00 2001 1From 71c734bb3754319029dcfc898cedbade42274dcb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:28:33 -0800 3Date: Sun, 14 Feb 2016 17:04:07 +0000
4Subject: [PATCH 07/15] Use libtool 2.4 4Subject: [PATCH 06/15] Use libtool 2.4
5 5
6get libtool sysroot support 6get libtool sysroot support
7 7
8Upstream-Status: Pending
9
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
9--- 11---
10Upstream-Status: Inappropriate [ OE configuration Specific]
11
12 bfd/configure | 1318 +++++++++++++++++------ 12 bfd/configure | 1318 +++++++++++++++++------
13 bfd/configure.ac | 2 +- 13 bfd/configure.ac | 2 +-
14 binutils/configure | 1316 +++++++++++++++++------ 14 binutils/configure | 1316 +++++++++++++++++------
15 configure | 2 +-
15 gas/configure | 1314 +++++++++++++++++------ 16 gas/configure | 1314 +++++++++++++++++------
16 gprof/configure | 1321 +++++++++++++++++------ 17 gprof/configure | 1321 +++++++++++++++++------
17 ld/configure | 1691 +++++++++++++++++++++-------- 18 ld/configure | 1691 +++++++++++++++++++++--------
@@ -23,10 +24,10 @@ Upstream-Status: Inappropriate [ OE configuration Specific]
23 opcodes/configure | 1318 +++++++++++++++++------ 24 opcodes/configure | 1318 +++++++++++++++++------
24 opcodes/configure.ac | 2 +- 25 opcodes/configure.ac | 2 +-
25 zlib/configure | 1316 +++++++++++++++++------ 26 zlib/configure | 1316 +++++++++++++++++------
26 14 files changed, 9926 insertions(+), 3693 deletions(-) 27 15 files changed, 9927 insertions(+), 3694 deletions(-)
27 28
28diff --git a/bfd/configure b/bfd/configure 29diff --git a/bfd/configure b/bfd/configure
29index f30bfabef3..fa1a545e9d 100755 30index 48276594ed..3ece8943f3 100755
30--- a/bfd/configure 31--- a/bfd/configure
31+++ b/bfd/configure 32+++ b/bfd/configure
32@@ -672,6 +672,9 @@ OTOOL 33@@ -672,6 +672,9 @@ OTOOL
@@ -212,7 +213,7 @@ index f30bfabef3..fa1a545e9d 100755
212 file_magic_cmd=$lt_cv_file_magic_cmd 213 file_magic_cmd=$lt_cv_file_magic_cmd
213 deplibs_check_method=$lt_cv_deplibs_check_method 214 deplibs_check_method=$lt_cv_deplibs_check_method
214 test -z "$deplibs_check_method" && deplibs_check_method=unknown 215 test -z "$deplibs_check_method" && deplibs_check_method=unknown
215@@ -6523,9 +6624,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 216@@ -6521,11 +6622,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
216 217
217 218
218 219
@@ -226,6 +227,8 @@ index f30bfabef3..fa1a545e9d 100755
226+ 227+
227+ 228+
228+ 229+
230
231
229 if test -n "$ac_tool_prefix"; then 232 if test -n "$ac_tool_prefix"; then
230- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 233- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
231-set dummy ${ac_tool_prefix}ar; ac_word=$2 234-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -588,12 +591,17 @@ index f30bfabef3..fa1a545e9d 100755
588 591
589 592
590 593
591@@ -7147,6 +7488,45 @@ fi 594@@ -7142,6 +7483,45 @@ fi
592 595
593 596
594 597
595+ 598+
596+ 599+
600+
601+
602+
603+
604+
597+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 605+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
598+$as_echo_n "checking for sysroot... " >&6; } 606+$as_echo_n "checking for sysroot... " >&6; }
599+ 607+
@@ -626,14 +634,9 @@ index f30bfabef3..fa1a545e9d 100755
626+ 634+
627+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 635+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
628+$as_echo "${lt_sysroot:-no}" >&6; } 636+$as_echo "${lt_sysroot:-no}" >&6; }
629+ 637
630+ 638
631+ 639
632+
633+
634 # Check whether --enable-libtool-lock was given.
635 if test "${enable_libtool_lock+set}" = set; then :
636 enableval=$enable_libtool_lock;
637@@ -7353,6 +7733,123 @@ esac 640@@ -7353,6 +7733,123 @@ esac
638 641
639 need_locks="$enable_libtool_lock" 642 need_locks="$enable_libtool_lock"
@@ -1331,7 +1334,7 @@ index f30bfabef3..fa1a545e9d 100755
1331 int main () 1334 int main ()
1332 { 1335 {
1333 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1336 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1334@@ -14122,7 +14777,7 @@ SHARED_LDFLAGS= 1337@@ -14172,7 +14827,7 @@ SHARED_LDFLAGS=
1335 if test "$enable_shared" = "yes"; then 1338 if test "$enable_shared" = "yes"; then
1336 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1339 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1337 if test -n "$x"; then 1340 if test -n "$x"; then
@@ -1340,7 +1343,7 @@ index f30bfabef3..fa1a545e9d 100755
1340 fi 1343 fi
1341 1344
1342 # More hacks to build DLLs on Windows. 1345 # More hacks to build DLLs on Windows.
1343@@ -16826,13 +17481,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1346@@ -16879,13 +17534,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1344 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1347 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1345 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1348 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1346 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1349 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1361,7 +1364,7 @@ index f30bfabef3..fa1a545e9d 100755
1361 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1364 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1362 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1365 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1363 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1366 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1364@@ -16847,14 +17509,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1367@@ -16900,14 +17562,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1365 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1368 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1366 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1369 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1367 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"`' 1370 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"`'
@@ -1380,7 +1383,7 @@ index f30bfabef3..fa1a545e9d 100755
1380 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1383 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1381 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1384 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1382 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1385 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1383@@ -16887,12 +17552,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1386@@ -16940,12 +17605,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1384 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1387 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1385 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1388 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1386 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1389 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1394,7 +1397,7 @@ index f30bfabef3..fa1a545e9d 100755
1394 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1397 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1395 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1398 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1396 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1399 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1397@@ -16947,8 +17612,13 @@ reload_flag \ 1400@@ -17000,8 +17665,13 @@ reload_flag \
1398 OBJDUMP \ 1401 OBJDUMP \
1399 deplibs_check_method \ 1402 deplibs_check_method \
1400 file_magic_cmd \ 1403 file_magic_cmd \
@@ -1408,7 +1411,7 @@ index f30bfabef3..fa1a545e9d 100755
1408 STRIP \ 1411 STRIP \
1409 RANLIB \ 1412 RANLIB \
1410 CC \ 1413 CC \
1411@@ -16958,12 +17628,14 @@ lt_cv_sys_global_symbol_pipe \ 1414@@ -17011,12 +17681,14 @@ lt_cv_sys_global_symbol_pipe \
1412 lt_cv_sys_global_symbol_to_cdecl \ 1415 lt_cv_sys_global_symbol_to_cdecl \
1413 lt_cv_sys_global_symbol_to_c_name_address \ 1416 lt_cv_sys_global_symbol_to_c_name_address \
1414 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1417 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1424,7 +1427,7 @@ index f30bfabef3..fa1a545e9d 100755
1424 DSYMUTIL \ 1427 DSYMUTIL \
1425 NMEDIT \ 1428 NMEDIT \
1426 LIPO \ 1429 LIPO \
1427@@ -16979,7 +17651,6 @@ no_undefined_flag \ 1430@@ -17032,7 +17704,6 @@ no_undefined_flag \
1428 hardcode_libdir_flag_spec \ 1431 hardcode_libdir_flag_spec \
1429 hardcode_libdir_flag_spec_ld \ 1432 hardcode_libdir_flag_spec_ld \
1430 hardcode_libdir_separator \ 1433 hardcode_libdir_separator \
@@ -1432,7 +1435,7 @@ index f30bfabef3..fa1a545e9d 100755
1432 exclude_expsyms \ 1435 exclude_expsyms \
1433 include_expsyms \ 1436 include_expsyms \
1434 file_list_spec \ 1437 file_list_spec \
1435@@ -17015,6 +17686,7 @@ module_cmds \ 1438@@ -17068,6 +17739,7 @@ module_cmds \
1436 module_expsym_cmds \ 1439 module_expsym_cmds \
1437 export_symbols_cmds \ 1440 export_symbols_cmds \
1438 prelink_cmds \ 1441 prelink_cmds \
@@ -1440,7 +1443,7 @@ index f30bfabef3..fa1a545e9d 100755
1440 postinstall_cmds \ 1443 postinstall_cmds \
1441 postuninstall_cmds \ 1444 postuninstall_cmds \
1442 finish_cmds \ 1445 finish_cmds \
1443@@ -17794,7 +18466,8 @@ $as_echo X"$file" | 1446@@ -17847,7 +18519,8 @@ $as_echo X"$file" |
1444 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1447 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1445 # 1448 #
1446 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1449 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1450,7 +1453,7 @@ index f30bfabef3..fa1a545e9d 100755
1450 # Written by Gordon Matzigkeit, 1996 1453 # Written by Gordon Matzigkeit, 1996
1451 # 1454 #
1452 # This file is part of GNU Libtool. 1455 # This file is part of GNU Libtool.
1453@@ -17897,19 +18570,42 @@ SP2NL=$lt_lt_SP2NL 1456@@ -17950,19 +18623,42 @@ SP2NL=$lt_lt_SP2NL
1454 # turn newlines into spaces. 1457 # turn newlines into spaces.
1455 NL2SP=$lt_lt_NL2SP 1458 NL2SP=$lt_lt_NL2SP
1456 1459
@@ -1494,7 +1497,7 @@ index f30bfabef3..fa1a545e9d 100755
1494 # A symbol stripping program. 1497 # A symbol stripping program.
1495 STRIP=$lt_STRIP 1498 STRIP=$lt_STRIP
1496 1499
1497@@ -17939,6 +18635,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1500@@ -17992,6 +18688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1498 # Transform the output of nm in a C name address pair when lib prefix is needed. 1501 # Transform the output of nm in a C name address pair when lib prefix is needed.
1499 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1502 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1500 1503
@@ -1507,7 +1510,7 @@ index f30bfabef3..fa1a545e9d 100755
1507 # The name of the directory that contains temporary libtool files. 1510 # The name of the directory that contains temporary libtool files.
1508 objdir=$objdir 1511 objdir=$objdir
1509 1512
1510@@ -17948,6 +18650,9 @@ MAGIC_CMD=$MAGIC_CMD 1513@@ -18001,6 +18703,9 @@ MAGIC_CMD=$MAGIC_CMD
1511 # Must we lock files when doing compilation? 1514 # Must we lock files when doing compilation?
1512 need_locks=$lt_need_locks 1515 need_locks=$lt_need_locks
1513 1516
@@ -1517,7 +1520,7 @@ index f30bfabef3..fa1a545e9d 100755
1517 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1520 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1518 DSYMUTIL=$lt_DSYMUTIL 1521 DSYMUTIL=$lt_DSYMUTIL
1519 1522
1520@@ -18062,12 +18767,12 @@ with_gcc=$GCC 1523@@ -18115,12 +18820,12 @@ with_gcc=$GCC
1521 # Compiler flag to turn off builtin functions. 1524 # Compiler flag to turn off builtin functions.
1522 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1525 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1523 1526
@@ -1533,7 +1536,7 @@ index f30bfabef3..fa1a545e9d 100755
1533 # Compiler flag to prevent dynamic linking. 1536 # Compiler flag to prevent dynamic linking.
1534 link_static_flag=$lt_lt_prog_compiler_static 1537 link_static_flag=$lt_lt_prog_compiler_static
1535 1538
1536@@ -18154,9 +18859,6 @@ inherit_rpath=$inherit_rpath 1539@@ -18207,9 +18912,6 @@ inherit_rpath=$inherit_rpath
1537 # Whether libtool must link a program against all its dependency libraries. 1540 # Whether libtool must link a program against all its dependency libraries.
1538 link_all_deplibs=$link_all_deplibs 1541 link_all_deplibs=$link_all_deplibs
1539 1542
@@ -1543,7 +1546,7 @@ index f30bfabef3..fa1a545e9d 100755
1543 # Set to "yes" if exported symbols are required. 1546 # Set to "yes" if exported symbols are required.
1544 always_export_symbols=$always_export_symbols 1547 always_export_symbols=$always_export_symbols
1545 1548
1546@@ -18172,6 +18874,9 @@ include_expsyms=$lt_include_expsyms 1549@@ -18225,6 +18927,9 @@ include_expsyms=$lt_include_expsyms
1547 # Commands necessary for linking programs (against libraries) with templates. 1550 # Commands necessary for linking programs (against libraries) with templates.
1548 prelink_cmds=$lt_prelink_cmds 1551 prelink_cmds=$lt_prelink_cmds
1549 1552
@@ -1553,7 +1556,7 @@ index f30bfabef3..fa1a545e9d 100755
1553 # Specify filename containing input files. 1556 # Specify filename containing input files.
1554 file_list_spec=$lt_file_list_spec 1557 file_list_spec=$lt_file_list_spec
1555 1558
1556@@ -18204,210 +18909,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1559@@ -18257,210 +18962,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1557 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1560 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1558 # text mode, it properly converts lines to CR/LF. This bash problem 1561 # text mode, it properly converts lines to CR/LF. This bash problem
1559 # is reportedly fixed, but why not run on old versions too? 1562 # is reportedly fixed, but why not run on old versions too?
@@ -1928,10 +1931,10 @@ index f30bfabef3..fa1a545e9d 100755
1928 chmod +x "$ofile" 1931 chmod +x "$ofile"
1929 1932
1930diff --git a/bfd/configure.ac b/bfd/configure.ac 1933diff --git a/bfd/configure.ac b/bfd/configure.ac
1931index 9a183c1628..3d8ea07836 100644 1934index 8fd03a7ea8..8816c3286c 100644
1932--- a/bfd/configure.ac 1935--- a/bfd/configure.ac
1933+++ b/bfd/configure.ac 1936+++ b/bfd/configure.ac
1934@@ -253,7 +253,7 @@ changequote(,)dnl 1937@@ -254,7 +254,7 @@ changequote(,)dnl
1935 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1938 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1936 changequote([,])dnl 1939 changequote([,])dnl
1937 if test -n "$x"; then 1940 if test -n "$x"; then
@@ -1941,7 +1944,7 @@ index 9a183c1628..3d8ea07836 100644
1941 1944
1942 # More hacks to build DLLs on Windows. 1945 # More hacks to build DLLs on Windows.
1943diff --git a/binutils/configure b/binutils/configure 1946diff --git a/binutils/configure b/binutils/configure
1944index 82119efe72..4a98918ce1 100755 1947index 22e1b1736e..321b63535b 100755
1945--- a/binutils/configure 1948--- a/binutils/configure
1946+++ b/binutils/configure 1949+++ b/binutils/configure
1947@@ -659,8 +659,11 @@ OTOOL 1950@@ -659,8 +659,11 @@ OTOOL
@@ -2513,10 +2516,12 @@ index 82119efe72..4a98918ce1 100755
2513 2516
2514 2517
2515 2518
2516@@ -6910,6 +7256,40 @@ fi 2519@@ -6908,6 +7254,40 @@ fi
2517 2520
2518 2521
2519 2522
2523+
2524+
2520+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 2525+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2521+$as_echo_n "checking for sysroot... " >&6; } 2526+$as_echo_n "checking for sysroot... " >&6; }
2522+ 2527+
@@ -2549,8 +2554,6 @@ index 82119efe72..4a98918ce1 100755
2549+ 2554+
2550+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 2555+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2551+$as_echo "${lt_sysroot:-no}" >&6; } 2556+$as_echo "${lt_sysroot:-no}" >&6; }
2552+
2553+
2554 2557
2555 2558
2556 2559
@@ -3251,7 +3254,7 @@ index 82119efe72..4a98918ce1 100755
3251 int main () 3254 int main ()
3252 { 3255 {
3253 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3256 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3254@@ -15436,13 +16091,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3257@@ -15446,13 +16101,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3255 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3258 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3256 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3259 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3257 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3260 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3272,7 +3275,7 @@ index 82119efe72..4a98918ce1 100755
3272 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3275 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3273 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3276 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3274 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3277 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3275@@ -15457,14 +16119,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3278@@ -15467,14 +16129,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3276 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3279 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3277 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3280 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3278 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"`' 3281 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"`'
@@ -3291,7 +3294,7 @@ index 82119efe72..4a98918ce1 100755
3291 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3294 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3292 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3295 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3293 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3296 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3294@@ -15497,12 +16162,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3297@@ -15507,12 +16172,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3295 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3298 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3296 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3299 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3297 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3300 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3305,7 +3308,7 @@ index 82119efe72..4a98918ce1 100755
3305 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3308 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3306 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3309 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3307 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3310 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3308@@ -15557,8 +16222,13 @@ reload_flag \ 3311@@ -15567,8 +16232,13 @@ reload_flag \
3309 OBJDUMP \ 3312 OBJDUMP \
3310 deplibs_check_method \ 3313 deplibs_check_method \
3311 file_magic_cmd \ 3314 file_magic_cmd \
@@ -3319,7 +3322,7 @@ index 82119efe72..4a98918ce1 100755
3319 STRIP \ 3322 STRIP \
3320 RANLIB \ 3323 RANLIB \
3321 CC \ 3324 CC \
3322@@ -15568,12 +16238,14 @@ lt_cv_sys_global_symbol_pipe \ 3325@@ -15578,12 +16248,14 @@ lt_cv_sys_global_symbol_pipe \
3323 lt_cv_sys_global_symbol_to_cdecl \ 3326 lt_cv_sys_global_symbol_to_cdecl \
3324 lt_cv_sys_global_symbol_to_c_name_address \ 3327 lt_cv_sys_global_symbol_to_c_name_address \
3325 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3328 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3335,7 +3338,7 @@ index 82119efe72..4a98918ce1 100755
3335 DSYMUTIL \ 3338 DSYMUTIL \
3336 NMEDIT \ 3339 NMEDIT \
3337 LIPO \ 3340 LIPO \
3338@@ -15589,7 +16261,6 @@ no_undefined_flag \ 3341@@ -15599,7 +16271,6 @@ no_undefined_flag \
3339 hardcode_libdir_flag_spec \ 3342 hardcode_libdir_flag_spec \
3340 hardcode_libdir_flag_spec_ld \ 3343 hardcode_libdir_flag_spec_ld \
3341 hardcode_libdir_separator \ 3344 hardcode_libdir_separator \
@@ -3343,7 +3346,7 @@ index 82119efe72..4a98918ce1 100755
3343 exclude_expsyms \ 3346 exclude_expsyms \
3344 include_expsyms \ 3347 include_expsyms \
3345 file_list_spec \ 3348 file_list_spec \
3346@@ -15625,6 +16296,7 @@ module_cmds \ 3349@@ -15635,6 +16306,7 @@ module_cmds \
3347 module_expsym_cmds \ 3350 module_expsym_cmds \
3348 export_symbols_cmds \ 3351 export_symbols_cmds \
3349 prelink_cmds \ 3352 prelink_cmds \
@@ -3351,7 +3354,7 @@ index 82119efe72..4a98918ce1 100755
3351 postinstall_cmds \ 3354 postinstall_cmds \
3352 postuninstall_cmds \ 3355 postuninstall_cmds \
3353 finish_cmds \ 3356 finish_cmds \
3354@@ -16382,7 +17054,8 @@ $as_echo X"$file" | 3357@@ -16392,7 +17064,8 @@ $as_echo X"$file" |
3355 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3358 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3356 # 3359 #
3357 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3360 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3361,7 +3364,7 @@ index 82119efe72..4a98918ce1 100755
3361 # Written by Gordon Matzigkeit, 1996 3364 # Written by Gordon Matzigkeit, 1996
3362 # 3365 #
3363 # This file is part of GNU Libtool. 3366 # This file is part of GNU Libtool.
3364@@ -16485,19 +17158,42 @@ SP2NL=$lt_lt_SP2NL 3367@@ -16495,19 +17168,42 @@ SP2NL=$lt_lt_SP2NL
3365 # turn newlines into spaces. 3368 # turn newlines into spaces.
3366 NL2SP=$lt_lt_NL2SP 3369 NL2SP=$lt_lt_NL2SP
3367 3370
@@ -3405,7 +3408,7 @@ index 82119efe72..4a98918ce1 100755
3405 # A symbol stripping program. 3408 # A symbol stripping program.
3406 STRIP=$lt_STRIP 3409 STRIP=$lt_STRIP
3407 3410
3408@@ -16527,6 +17223,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3411@@ -16537,6 +17233,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3409 # Transform the output of nm in a C name address pair when lib prefix is needed. 3412 # Transform the output of nm in a C name address pair when lib prefix is needed.
3410 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3413 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3411 3414
@@ -3418,7 +3421,7 @@ index 82119efe72..4a98918ce1 100755
3418 # The name of the directory that contains temporary libtool files. 3421 # The name of the directory that contains temporary libtool files.
3419 objdir=$objdir 3422 objdir=$objdir
3420 3423
3421@@ -16536,6 +17238,9 @@ MAGIC_CMD=$MAGIC_CMD 3424@@ -16546,6 +17248,9 @@ MAGIC_CMD=$MAGIC_CMD
3422 # Must we lock files when doing compilation? 3425 # Must we lock files when doing compilation?
3423 need_locks=$lt_need_locks 3426 need_locks=$lt_need_locks
3424 3427
@@ -3428,7 +3431,7 @@ index 82119efe72..4a98918ce1 100755
3428 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3431 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3429 DSYMUTIL=$lt_DSYMUTIL 3432 DSYMUTIL=$lt_DSYMUTIL
3430 3433
3431@@ -16650,12 +17355,12 @@ with_gcc=$GCC 3434@@ -16660,12 +17365,12 @@ with_gcc=$GCC
3432 # Compiler flag to turn off builtin functions. 3435 # Compiler flag to turn off builtin functions.
3433 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3436 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3434 3437
@@ -3444,7 +3447,7 @@ index 82119efe72..4a98918ce1 100755
3444 # Compiler flag to prevent dynamic linking. 3447 # Compiler flag to prevent dynamic linking.
3445 link_static_flag=$lt_lt_prog_compiler_static 3448 link_static_flag=$lt_lt_prog_compiler_static
3446 3449
3447@@ -16742,9 +17447,6 @@ inherit_rpath=$inherit_rpath 3450@@ -16752,9 +17457,6 @@ inherit_rpath=$inherit_rpath
3448 # Whether libtool must link a program against all its dependency libraries. 3451 # Whether libtool must link a program against all its dependency libraries.
3449 link_all_deplibs=$link_all_deplibs 3452 link_all_deplibs=$link_all_deplibs
3450 3453
@@ -3454,7 +3457,7 @@ index 82119efe72..4a98918ce1 100755
3454 # Set to "yes" if exported symbols are required. 3457 # Set to "yes" if exported symbols are required.
3455 always_export_symbols=$always_export_symbols 3458 always_export_symbols=$always_export_symbols
3456 3459
3457@@ -16760,6 +17462,9 @@ include_expsyms=$lt_include_expsyms 3460@@ -16770,6 +17472,9 @@ include_expsyms=$lt_include_expsyms
3458 # Commands necessary for linking programs (against libraries) with templates. 3461 # Commands necessary for linking programs (against libraries) with templates.
3459 prelink_cmds=$lt_prelink_cmds 3462 prelink_cmds=$lt_prelink_cmds
3460 3463
@@ -3464,7 +3467,7 @@ index 82119efe72..4a98918ce1 100755
3464 # Specify filename containing input files. 3467 # Specify filename containing input files.
3465 file_list_spec=$lt_file_list_spec 3468 file_list_spec=$lt_file_list_spec
3466 3469
3467@@ -16792,210 +17497,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3470@@ -16802,210 +17507,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3468 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3471 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3469 # text mode, it properly converts lines to CR/LF. This bash problem 3472 # text mode, it properly converts lines to CR/LF. This bash problem
3470 # is reportedly fixed, but why not run on old versions too? 3473 # is reportedly fixed, but why not run on old versions too?
@@ -3838,8 +3841,21 @@ index 82119efe72..4a98918ce1 100755
3838 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 3841 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3839 chmod +x "$ofile" 3842 chmod +x "$ofile"
3840 3843
3844diff --git a/configure b/configure
3845index d8af155ab5..005ed827ab 100755
3846--- a/configure
3847+++ b/configure
3848@@ -3844,7 +3844,7 @@ case "${target}" in
3849 or1k*-*-*)
3850 noconfigdirs="$noconfigdirs gdb"
3851 ;;
3852- sh*-*-* | sh64-*-*)
3853+ sh-*-* | sh64-*-*)
3854 case "${target}" in
3855 sh*-*-elf)
3856 ;;
3841diff --git a/gas/configure b/gas/configure 3857diff --git a/gas/configure b/gas/configure
3842index e574cb8514..a36f1ae161 100755 3858index 93afb20c8f..81dd4cbd97 100755
3843--- a/gas/configure 3859--- a/gas/configure
3844+++ b/gas/configure 3860+++ b/gas/configure
3845@@ -650,8 +650,11 @@ OTOOL 3861@@ -650,8 +650,11 @@ OTOOL
@@ -4402,10 +4418,12 @@ index e574cb8514..a36f1ae161 100755
4402 4418
4403 4419
4404 4420
4405@@ -6671,6 +7015,40 @@ fi 4421@@ -6669,6 +7013,40 @@ fi
4406 4422
4407 4423
4408 4424
4425+
4426+
4409+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 4427+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4410+$as_echo_n "checking for sysroot... " >&6; } 4428+$as_echo_n "checking for sysroot... " >&6; }
4411+ 4429+
@@ -4438,8 +4456,6 @@ index e574cb8514..a36f1ae161 100755
4438+ 4456+
4439+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 4457+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4440+$as_echo "${lt_sysroot:-no}" >&6; } 4458+$as_echo "${lt_sysroot:-no}" >&6; }
4441+
4442+
4443 4459
4444 4460
4445 4461
@@ -5140,7 +5156,7 @@ index e574cb8514..a36f1ae161 100755
5140 int main () 5156 int main ()
5141 { 5157 {
5142 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5158 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5143@@ -15425,13 +16078,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5159@@ -15436,13 +16089,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5144 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5160 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5145 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5161 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5146 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5162 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5161,7 +5177,7 @@ index e574cb8514..a36f1ae161 100755
5161 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5177 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5162 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5178 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5163 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5179 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5164@@ -15446,14 +16106,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5180@@ -15457,14 +16117,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5165 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5181 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5166 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5182 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5167 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"`' 5183 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"`'
@@ -5180,7 +5196,7 @@ index e574cb8514..a36f1ae161 100755
5180 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5196 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5181 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5197 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5182 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5198 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5183@@ -15486,12 +16149,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5199@@ -15497,12 +16160,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5184 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5200 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5185 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5201 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5186 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5202 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5194,7 +5210,7 @@ index e574cb8514..a36f1ae161 100755
5194 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5210 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5195 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5211 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5196 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5212 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5197@@ -15546,8 +16209,13 @@ reload_flag \ 5213@@ -15557,8 +16220,13 @@ reload_flag \
5198 OBJDUMP \ 5214 OBJDUMP \
5199 deplibs_check_method \ 5215 deplibs_check_method \
5200 file_magic_cmd \ 5216 file_magic_cmd \
@@ -5208,7 +5224,7 @@ index e574cb8514..a36f1ae161 100755
5208 STRIP \ 5224 STRIP \
5209 RANLIB \ 5225 RANLIB \
5210 CC \ 5226 CC \
5211@@ -15557,12 +16225,14 @@ lt_cv_sys_global_symbol_pipe \ 5227@@ -15568,12 +16236,14 @@ lt_cv_sys_global_symbol_pipe \
5212 lt_cv_sys_global_symbol_to_cdecl \ 5228 lt_cv_sys_global_symbol_to_cdecl \
5213 lt_cv_sys_global_symbol_to_c_name_address \ 5229 lt_cv_sys_global_symbol_to_c_name_address \
5214 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5230 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5224,7 +5240,7 @@ index e574cb8514..a36f1ae161 100755
5224 DSYMUTIL \ 5240 DSYMUTIL \
5225 NMEDIT \ 5241 NMEDIT \
5226 LIPO \ 5242 LIPO \
5227@@ -15578,7 +16248,6 @@ no_undefined_flag \ 5243@@ -15589,7 +16259,6 @@ no_undefined_flag \
5228 hardcode_libdir_flag_spec \ 5244 hardcode_libdir_flag_spec \
5229 hardcode_libdir_flag_spec_ld \ 5245 hardcode_libdir_flag_spec_ld \
5230 hardcode_libdir_separator \ 5246 hardcode_libdir_separator \
@@ -5232,7 +5248,7 @@ index e574cb8514..a36f1ae161 100755
5232 exclude_expsyms \ 5248 exclude_expsyms \
5233 include_expsyms \ 5249 include_expsyms \
5234 file_list_spec \ 5250 file_list_spec \
5235@@ -15614,6 +16283,7 @@ module_cmds \ 5251@@ -15625,6 +16294,7 @@ module_cmds \
5236 module_expsym_cmds \ 5252 module_expsym_cmds \
5237 export_symbols_cmds \ 5253 export_symbols_cmds \
5238 prelink_cmds \ 5254 prelink_cmds \
@@ -5240,7 +5256,7 @@ index e574cb8514..a36f1ae161 100755
5240 postinstall_cmds \ 5256 postinstall_cmds \
5241 postuninstall_cmds \ 5257 postuninstall_cmds \
5242 finish_cmds \ 5258 finish_cmds \
5243@@ -16378,7 +17048,8 @@ $as_echo X"$file" | 5259@@ -16389,7 +17059,8 @@ $as_echo X"$file" |
5244 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5260 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5245 # 5261 #
5246 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5262 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5250,7 +5266,7 @@ index e574cb8514..a36f1ae161 100755
5250 # Written by Gordon Matzigkeit, 1996 5266 # Written by Gordon Matzigkeit, 1996
5251 # 5267 #
5252 # This file is part of GNU Libtool. 5268 # This file is part of GNU Libtool.
5253@@ -16481,19 +17152,42 @@ SP2NL=$lt_lt_SP2NL 5269@@ -16492,19 +17163,42 @@ SP2NL=$lt_lt_SP2NL
5254 # turn newlines into spaces. 5270 # turn newlines into spaces.
5255 NL2SP=$lt_lt_NL2SP 5271 NL2SP=$lt_lt_NL2SP
5256 5272
@@ -5294,7 +5310,7 @@ index e574cb8514..a36f1ae161 100755
5294 # A symbol stripping program. 5310 # A symbol stripping program.
5295 STRIP=$lt_STRIP 5311 STRIP=$lt_STRIP
5296 5312
5297@@ -16523,6 +17217,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5313@@ -16534,6 +17228,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5298 # Transform the output of nm in a C name address pair when lib prefix is needed. 5314 # Transform the output of nm in a C name address pair when lib prefix is needed.
5299 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5315 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5300 5316
@@ -5307,7 +5323,7 @@ index e574cb8514..a36f1ae161 100755
5307 # The name of the directory that contains temporary libtool files. 5323 # The name of the directory that contains temporary libtool files.
5308 objdir=$objdir 5324 objdir=$objdir
5309 5325
5310@@ -16532,6 +17232,9 @@ MAGIC_CMD=$MAGIC_CMD 5326@@ -16543,6 +17243,9 @@ MAGIC_CMD=$MAGIC_CMD
5311 # Must we lock files when doing compilation? 5327 # Must we lock files when doing compilation?
5312 need_locks=$lt_need_locks 5328 need_locks=$lt_need_locks
5313 5329
@@ -5317,7 +5333,7 @@ index e574cb8514..a36f1ae161 100755
5317 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5333 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5318 DSYMUTIL=$lt_DSYMUTIL 5334 DSYMUTIL=$lt_DSYMUTIL
5319 5335
5320@@ -16646,12 +17349,12 @@ with_gcc=$GCC 5336@@ -16657,12 +17360,12 @@ with_gcc=$GCC
5321 # Compiler flag to turn off builtin functions. 5337 # Compiler flag to turn off builtin functions.
5322 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5338 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5323 5339
@@ -5333,7 +5349,7 @@ index e574cb8514..a36f1ae161 100755
5333 # Compiler flag to prevent dynamic linking. 5349 # Compiler flag to prevent dynamic linking.
5334 link_static_flag=$lt_lt_prog_compiler_static 5350 link_static_flag=$lt_lt_prog_compiler_static
5335 5351
5336@@ -16738,9 +17441,6 @@ inherit_rpath=$inherit_rpath 5352@@ -16749,9 +17452,6 @@ inherit_rpath=$inherit_rpath
5337 # Whether libtool must link a program against all its dependency libraries. 5353 # Whether libtool must link a program against all its dependency libraries.
5338 link_all_deplibs=$link_all_deplibs 5354 link_all_deplibs=$link_all_deplibs
5339 5355
@@ -5343,7 +5359,7 @@ index e574cb8514..a36f1ae161 100755
5343 # Set to "yes" if exported symbols are required. 5359 # Set to "yes" if exported symbols are required.
5344 always_export_symbols=$always_export_symbols 5360 always_export_symbols=$always_export_symbols
5345 5361
5346@@ -16756,6 +17456,9 @@ include_expsyms=$lt_include_expsyms 5362@@ -16767,6 +17467,9 @@ include_expsyms=$lt_include_expsyms
5347 # Commands necessary for linking programs (against libraries) with templates. 5363 # Commands necessary for linking programs (against libraries) with templates.
5348 prelink_cmds=$lt_prelink_cmds 5364 prelink_cmds=$lt_prelink_cmds
5349 5365
@@ -5353,7 +5369,7 @@ index e574cb8514..a36f1ae161 100755
5353 # Specify filename containing input files. 5369 # Specify filename containing input files.
5354 file_list_spec=$lt_file_list_spec 5370 file_list_spec=$lt_file_list_spec
5355 5371
5356@@ -16788,210 +17491,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5372@@ -16799,210 +17502,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5357 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5373 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5358 # text mode, it properly converts lines to CR/LF. This bash problem 5374 # text mode, it properly converts lines to CR/LF. This bash problem
5359 # is reportedly fixed, but why not run on old versions too? 5375 # is reportedly fixed, but why not run on old versions too?
@@ -5728,7 +5744,7 @@ index e574cb8514..a36f1ae161 100755
5728 chmod +x "$ofile" 5744 chmod +x "$ofile"
5729 5745
5730diff --git a/gprof/configure b/gprof/configure 5746diff --git a/gprof/configure b/gprof/configure
5731index 38a4c0b0e5..38d1f699c7 100755 5747index 679e0dce77..ac4c016a63 100755
5732--- a/gprof/configure 5748--- a/gprof/configure
5733+++ b/gprof/configure 5749+++ b/gprof/configure
5734@@ -631,8 +631,11 @@ OTOOL 5750@@ -631,8 +631,11 @@ OTOOL
@@ -5894,6 +5910,18 @@ index 38a4c0b0e5..38d1f699c7 100755
5894 lt_cv_file_magic_cmd='$OBJDUMP -f' 5910 lt_cv_file_magic_cmd='$OBJDUMP -f'
5895 fi 5911 fi
5896 ;; 5912 ;;
5913@@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5914 lt_cv_deplibs_check_method=pass_all
5915 ;;
5916
5917-linux-uclibc*)
5918- lt_cv_deplibs_check_method=pass_all
5919- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
5920- ;;
5921-
5922 netbsd*)
5923 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5924 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5897@@ -5956,6 +6037,21 @@ esac 5925@@ -5956,6 +6037,21 @@ esac
5898 fi 5926 fi
5899 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5927 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
@@ -6297,10 +6325,15 @@ index 38a4c0b0e5..38d1f699c7 100755
6297 6325
6298 6326
6299 6327
6300@@ -6595,6 +6933,43 @@ fi 6328@@ -6590,6 +6928,43 @@ fi
6301 6329
6302 6330
6303 6331
6332+
6333+
6334+
6335+
6336+
6304+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 6337+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6305+$as_echo_n "checking for sysroot... " >&6; } 6338+$as_echo_n "checking for sysroot... " >&6; }
6306+ 6339+
@@ -6333,14 +6366,9 @@ index 38a4c0b0e5..38d1f699c7 100755
6333+ 6366+
6334+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 6367+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6335+$as_echo "${lt_sysroot:-no}" >&6; } 6368+$as_echo "${lt_sysroot:-no}" >&6; }
6336+ 6369
6337+ 6370
6338+ 6371
6339+
6340+
6341 # Check whether --enable-libtool-lock was given.
6342 if test "${enable_libtool_lock+set}" = set; then :
6343 enableval=$enable_libtool_lock;
6344@@ -6801,6 +7176,123 @@ esac 6372@@ -6801,6 +7176,123 @@ esac
6345 6373
6346 need_locks="$enable_libtool_lock" 6374 need_locks="$enable_libtool_lock"
@@ -7626,10 +7654,10 @@ index 38a4c0b0e5..38d1f699c7 100755
7626 chmod +x "$ofile" 7654 chmod +x "$ofile"
7627 7655
7628diff --git a/ld/configure b/ld/configure 7656diff --git a/ld/configure b/ld/configure
7629index a16c6db059..4277b74bad 100755 7657index d7f66f8cdc..4e71511bd1 100755
7630--- a/ld/configure 7658--- a/ld/configure
7631+++ b/ld/configure 7659+++ b/ld/configure
7632@@ -659,8 +659,11 @@ OTOOL 7660@@ -655,8 +655,11 @@ OTOOL
7633 LIPO 7661 LIPO
7634 NMEDIT 7662 NMEDIT
7635 DSYMUTIL 7663 DSYMUTIL
@@ -7641,7 +7669,7 @@ index a16c6db059..4277b74bad 100755
7641 OBJDUMP 7669 OBJDUMP
7642 LN_S 7670 LN_S
7643 NM 7671 NM
7644@@ -782,6 +785,7 @@ enable_static 7672@@ -778,6 +781,7 @@ enable_static
7645 with_pic 7673 with_pic
7646 enable_fast_install 7674 enable_fast_install
7647 with_gnu_ld 7675 with_gnu_ld
@@ -7649,7 +7677,7 @@ index a16c6db059..4277b74bad 100755
7649 enable_libtool_lock 7677 enable_libtool_lock
7650 enable_plugins 7678 enable_plugins
7651 enable_largefile 7679 enable_largefile
7652@@ -1463,6 +1467,8 @@ Optional Packages: 7680@@ -1464,6 +1468,8 @@ Optional Packages:
7653 --with-pic try to use only PIC/non-PIC objects [default=use 7681 --with-pic try to use only PIC/non-PIC objects [default=use
7654 both] 7682 both]
7655 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7683 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7658,7 +7686,7 @@ index a16c6db059..4277b74bad 100755
7658 --with-lib-path=dir1:dir2... set default LIB_PATH 7686 --with-lib-path=dir1:dir2... set default LIB_PATH
7659 --with-sysroot=DIR Search for usr/lib et al within DIR. 7687 --with-sysroot=DIR Search for usr/lib et al within DIR.
7660 7688
7661@@ -5657,8 +5663,8 @@ esac 7689@@ -5658,8 +5664,8 @@ esac
7662 7690
7663 7691
7664 7692
@@ -7669,7 +7697,7 @@ index a16c6db059..4277b74bad 100755
7669 7697
7670 7698
7671 7699
7672@@ -5698,7 +5704,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7700@@ -5699,7 +5705,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7673 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7701 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7674 $as_echo_n "checking how to print strings... " >&6; } 7702 $as_echo_n "checking how to print strings... " >&6; }
7675 # Test print first, because it will be a builtin if present. 7703 # Test print first, because it will be a builtin if present.
@@ -7678,7 +7706,7 @@ index a16c6db059..4277b74bad 100755
7678 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7706 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7679 ECHO='print -r --' 7707 ECHO='print -r --'
7680 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7708 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7681@@ -6384,8 +6390,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7709@@ -6385,8 +6391,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7682 # Try some XSI features 7710 # Try some XSI features
7683 xsi_shell=no 7711 xsi_shell=no
7684 ( _lt_dummy="a/b/c" 7712 ( _lt_dummy="a/b/c"
@@ -7689,7 +7717,7 @@ index a16c6db059..4277b74bad 100755
7689 && eval 'test $(( 1 + 1 )) -eq 2 \ 7717 && eval 'test $(( 1 + 1 )) -eq 2 \
7690 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7718 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7691 && xsi_shell=yes 7719 && xsi_shell=yes
7692@@ -6434,6 +6440,80 @@ esac 7720@@ -6435,6 +6441,80 @@ esac
7693 7721
7694 7722
7695 7723
@@ -7770,7 +7798,7 @@ index a16c6db059..4277b74bad 100755
7770 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7771 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7799 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7772 if test "${lt_cv_ld_reload_flag+set}" = set; then : 7800 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7773@@ -6450,6 +6530,11 @@ case $reload_flag in 7801@@ -6451,6 +6531,11 @@ case $reload_flag in
7774 esac 7802 esac
7775 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7803 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7776 case $host_os in 7804 case $host_os in
@@ -7782,7 +7810,7 @@ index a16c6db059..4277b74bad 100755
7782 darwin*) 7810 darwin*)
7783 if test "$GCC" = yes; then 7811 if test "$GCC" = yes; then
7784 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7812 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7785@@ -6618,7 +6703,8 @@ mingw* | pw32*) 7813@@ -6619,7 +6704,8 @@ mingw* | pw32*)
7786 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7814 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7787 lt_cv_file_magic_cmd='func_win32_libid' 7815 lt_cv_file_magic_cmd='func_win32_libid'
7788 else 7816 else
@@ -7792,7 +7820,7 @@ index a16c6db059..4277b74bad 100755
7792 lt_cv_file_magic_cmd='$OBJDUMP -f' 7820 lt_cv_file_magic_cmd='$OBJDUMP -f'
7793 fi 7821 fi
7794 ;; 7822 ;;
7795@@ -6772,6 +6858,21 @@ esac 7823@@ -6773,6 +6859,21 @@ esac
7796 fi 7824 fi
7797 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7825 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7798 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7826 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7814,7 +7842,7 @@ index a16c6db059..4277b74bad 100755
7814 file_magic_cmd=$lt_cv_file_magic_cmd 7842 file_magic_cmd=$lt_cv_file_magic_cmd
7815 deplibs_check_method=$lt_cv_deplibs_check_method 7843 deplibs_check_method=$lt_cv_deplibs_check_method
7816 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7844 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7817@@ -6787,9 +6888,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7845@@ -6788,9 +6889,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7818 7846
7819 7847
7820 7848
@@ -7979,7 +8007,7 @@ index a16c6db059..4277b74bad 100755
7979 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8007 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7980 $as_echo_n "checking for $ac_word... " >&6; } 8008 $as_echo_n "checking for $ac_word... " >&6; }
7981 if test "${ac_cv_prog_AR+set}" = set; then : 8009 if test "${ac_cv_prog_AR+set}" = set; then :
7982@@ -6805,7 +7059,7 @@ do 8010@@ -6806,7 +7060,7 @@ do
7983 test -z "$as_dir" && as_dir=. 8011 test -z "$as_dir" && as_dir=.
7984 for ac_exec_ext in '' $ac_executable_extensions; do 8012 for ac_exec_ext in '' $ac_executable_extensions; do
7985 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8013 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -7988,7 +8016,7 @@ index a16c6db059..4277b74bad 100755
7988 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8016 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7989 break 2 8017 break 2
7990 fi 8018 fi
7991@@ -6825,11 +7079,15 @@ $as_echo "no" >&6; } 8019@@ -6826,11 +7080,15 @@ $as_echo "no" >&6; }
7992 fi 8020 fi
7993 8021
7994 8022
@@ -8007,7 +8035,7 @@ index a16c6db059..4277b74bad 100755
8007 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8035 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8008 $as_echo_n "checking for $ac_word... " >&6; } 8036 $as_echo_n "checking for $ac_word... " >&6; }
8009 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 8037 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
8010@@ -6845,7 +7103,7 @@ do 8038@@ -6846,7 +7104,7 @@ do
8011 test -z "$as_dir" && as_dir=. 8039 test -z "$as_dir" && as_dir=.
8012 for ac_exec_ext in '' $ac_executable_extensions; do 8040 for ac_exec_ext in '' $ac_executable_extensions; do
8013 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8041 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -8016,7 +8044,7 @@ index a16c6db059..4277b74bad 100755
8016 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8044 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8017 break 2 8045 break 2
8018 fi 8046 fi
8019@@ -6864,6 +7122,10 @@ else 8047@@ -6865,6 +7123,10 @@ else
8020 $as_echo "no" >&6; } 8048 $as_echo "no" >&6; }
8021 fi 8049 fi
8022 8050
@@ -8027,7 +8055,7 @@ index a16c6db059..4277b74bad 100755
8027 if test "x$ac_ct_AR" = x; then 8055 if test "x$ac_ct_AR" = x; then
8028 AR="false" 8056 AR="false"
8029 else 8057 else
8030@@ -6875,12 +7137,12 @@ ac_tool_warned=yes ;; 8058@@ -6876,12 +7138,12 @@ ac_tool_warned=yes ;;
8031 esac 8059 esac
8032 AR=$ac_ct_AR 8060 AR=$ac_ct_AR
8033 fi 8061 fi
@@ -8044,7 +8072,7 @@ index a16c6db059..4277b74bad 100755
8044 8072
8045 8073
8046 8074
8047@@ -6890,6 +7152,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8075@@ -6891,6 +7153,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8048 8076
8049 8077
8050 8078
@@ -8107,7 +8135,7 @@ index a16c6db059..4277b74bad 100755
8107 8135
8108 8136
8109 if test -n "$ac_tool_prefix"; then 8137 if test -n "$ac_tool_prefix"; then
8110@@ -7226,8 +7544,8 @@ esac 8138@@ -7227,8 +7545,8 @@ esac
8111 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8139 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8112 8140
8113 # Transform an extracted symbol line into symbol name and symbol address 8141 # Transform an extracted symbol line into symbol name and symbol address
@@ -8118,7 +8146,7 @@ index a16c6db059..4277b74bad 100755
8118 8146
8119 # Handle CRLF in mingw tool chain 8147 # Handle CRLF in mingw tool chain
8120 opt_cr= 8148 opt_cr=
8121@@ -7263,6 +7581,7 @@ for ac_symprfx in "" "_"; do 8149@@ -7264,6 +7582,7 @@ for ac_symprfx in "" "_"; do
8122 else 8150 else
8123 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8151 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8124 fi 8152 fi
@@ -8126,7 +8154,7 @@ index a16c6db059..4277b74bad 100755
8126 8154
8127 # Check to see that the pipe works correctly. 8155 # Check to see that the pipe works correctly.
8128 pipe_works=no 8156 pipe_works=no
8129@@ -7304,6 +7623,18 @@ _LT_EOF 8157@@ -7305,6 +7624,18 @@ _LT_EOF
8130 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8158 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8131 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8159 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8132 cat <<_LT_EOF > conftest.$ac_ext 8160 cat <<_LT_EOF > conftest.$ac_ext
@@ -8145,7 +8173,7 @@ index a16c6db059..4277b74bad 100755
8145 #ifdef __cplusplus 8173 #ifdef __cplusplus
8146 extern "C" { 8174 extern "C" {
8147 #endif 8175 #endif
8148@@ -7315,7 +7646,7 @@ _LT_EOF 8176@@ -7316,7 +7647,7 @@ _LT_EOF
8149 cat <<_LT_EOF >> conftest.$ac_ext 8177 cat <<_LT_EOF >> conftest.$ac_ext
8150 8178
8151 /* The mapping between symbol names and symbols. */ 8179 /* The mapping between symbol names and symbols. */
@@ -8154,7 +8182,7 @@ index a16c6db059..4277b74bad 100755
8154 const char *name; 8182 const char *name;
8155 void *address; 8183 void *address;
8156 } 8184 }
8157@@ -7341,8 +7672,8 @@ static const void *lt_preloaded_setup() { 8185@@ -7342,8 +7673,8 @@ static const void *lt_preloaded_setup() {
8158 _LT_EOF 8186 _LT_EOF
8159 # Now try linking the two files. 8187 # Now try linking the two files.
8160 mv conftest.$ac_objext conftstm.$ac_objext 8188 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8165,7 +8193,7 @@ index a16c6db059..4277b74bad 100755
8165 LIBS="conftstm.$ac_objext" 8193 LIBS="conftstm.$ac_objext"
8166 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8194 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8167 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8195 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8168@@ -7352,8 +7683,8 @@ _LT_EOF 8196@@ -7353,8 +7684,8 @@ _LT_EOF
8169 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8197 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8170 pipe_works=yes 8198 pipe_works=yes
8171 fi 8199 fi
@@ -8176,7 +8204,7 @@ index a16c6db059..4277b74bad 100755
8176 else 8204 else
8177 echo "cannot find nm_test_func in $nlist" >&5 8205 echo "cannot find nm_test_func in $nlist" >&5
8178 fi 8206 fi
8179@@ -7390,6 +7721,19 @@ else 8207@@ -7391,6 +7722,19 @@ else
8180 $as_echo "ok" >&6; } 8208 $as_echo "ok" >&6; }
8181 fi 8209 fi
8182 8210
@@ -8196,10 +8224,14 @@ index a16c6db059..4277b74bad 100755
8196 8224
8197 8225
8198 8226
8199@@ -7410,6 +7754,42 @@ fi 8227@@ -7404,6 +7748,42 @@ fi
8200 8228
8201 8229
8202 8230
8231+
8232+
8233+
8234+
8203+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 8235+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8204+$as_echo_n "checking for sysroot... " >&6; } 8236+$as_echo_n "checking for sysroot... " >&6; }
8205+ 8237+
@@ -8232,14 +8264,10 @@ index a16c6db059..4277b74bad 100755
8232+ 8264+
8233+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 8265+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8234+$as_echo "${lt_sysroot:-no}" >&6; } 8266+$as_echo "${lt_sysroot:-no}" >&6; }
8235+
8236+
8237+
8238+
8239 8267
8240 # Check whether --enable-libtool-lock was given. 8268
8241 if test "${enable_libtool_lock+set}" = set; then : 8269
8242@@ -7617,6 +7997,123 @@ esac 8270@@ -7618,6 +7998,123 @@ esac
8243 8271
8244 need_locks="$enable_libtool_lock" 8272 need_locks="$enable_libtool_lock"
8245 8273
@@ -8363,7 +8391,7 @@ index a16c6db059..4277b74bad 100755
8363 8391
8364 case $host_os in 8392 case $host_os in
8365 rhapsody* | darwin*) 8393 rhapsody* | darwin*)
8366@@ -8180,6 +8677,8 @@ _LT_EOF 8394@@ -8181,6 +8678,8 @@ _LT_EOF
8367 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8395 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8368 echo "$AR cru libconftest.a conftest.o" >&5 8396 echo "$AR cru libconftest.a conftest.o" >&5
8369 $AR cru libconftest.a conftest.o 2>&5 8397 $AR cru libconftest.a conftest.o 2>&5
@@ -8372,7 +8400,7 @@ index a16c6db059..4277b74bad 100755
8372 cat > conftest.c << _LT_EOF 8400 cat > conftest.c << _LT_EOF
8373 int main() { return 0;} 8401 int main() { return 0;}
8374 _LT_EOF 8402 _LT_EOF
8375@@ -8248,6 +8747,16 @@ done 8403@@ -8249,6 +8748,16 @@ done
8376 8404
8377 8405
8378 8406
@@ -8389,7 +8417,7 @@ index a16c6db059..4277b74bad 100755
8389 8417
8390 8418
8391 # Set options 8419 # Set options
8392@@ -8376,7 +8885,8 @@ fi 8420@@ -8377,7 +8886,8 @@ fi
8393 LIBTOOL_DEPS="$ltmain" 8421 LIBTOOL_DEPS="$ltmain"
8394 8422
8395 # Always use our own libtool. 8423 # Always use our own libtool.
@@ -8399,7 +8427,7 @@ index a16c6db059..4277b74bad 100755
8399 8427
8400 8428
8401 8429
8402@@ -8465,7 +8975,7 @@ aix3*) 8430@@ -8466,7 +8976,7 @@ aix3*)
8403 esac 8431 esac
8404 8432
8405 # Global variables: 8433 # Global variables:
@@ -8408,7 +8436,7 @@ index a16c6db059..4277b74bad 100755
8408 can_build_shared=yes 8436 can_build_shared=yes
8409 8437
8410 # All known linkers require a `.a' archive for static linking (except MSVC, 8438 # All known linkers require a `.a' archive for static linking (except MSVC,
8411@@ -8763,8 +9273,6 @@ fi 8439@@ -8764,8 +9274,6 @@ fi
8412 lt_prog_compiler_pic= 8440 lt_prog_compiler_pic=
8413 lt_prog_compiler_static= 8441 lt_prog_compiler_static=
8414 8442
@@ -8417,7 +8445,7 @@ index a16c6db059..4277b74bad 100755
8417 8445
8418 if test "$GCC" = yes; then 8446 if test "$GCC" = yes; then
8419 lt_prog_compiler_wl='-Wl,' 8447 lt_prog_compiler_wl='-Wl,'
8420@@ -8930,6 +9438,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8448@@ -8931,6 +9439,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8421 lt_prog_compiler_pic='--shared' 8449 lt_prog_compiler_pic='--shared'
8422 lt_prog_compiler_static='--static' 8450 lt_prog_compiler_static='--static'
8423 ;; 8451 ;;
@@ -8430,7 +8458,7 @@ index a16c6db059..4277b74bad 100755
8430 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8458 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8431 # Portland Group compilers (*not* the Pentium gcc compiler, 8459 # Portland Group compilers (*not* the Pentium gcc compiler,
8432 # which looks to be a dead project) 8460 # which looks to be a dead project)
8433@@ -8992,7 +9506,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8461@@ -8993,7 +9507,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8434 lt_prog_compiler_pic='-KPIC' 8462 lt_prog_compiler_pic='-KPIC'
8435 lt_prog_compiler_static='-Bstatic' 8463 lt_prog_compiler_static='-Bstatic'
8436 case $cc_basename in 8464 case $cc_basename in
@@ -8439,7 +8467,7 @@ index a16c6db059..4277b74bad 100755
8439 lt_prog_compiler_wl='-Qoption ld ';; 8467 lt_prog_compiler_wl='-Qoption ld ';;
8440 *) 8468 *)
8441 lt_prog_compiler_wl='-Wl,';; 8469 lt_prog_compiler_wl='-Wl,';;
8442@@ -9049,13 +9563,17 @@ case $host_os in 8470@@ -9050,13 +9564,17 @@ case $host_os in
8443 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8471 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8444 ;; 8472 ;;
8445 esac 8473 esac
@@ -8463,7 +8491,7 @@ index a16c6db059..4277b74bad 100755
8463 8491
8464 # 8492 #
8465 # Check to make sure the PIC flag actually works. 8493 # Check to make sure the PIC flag actually works.
8466@@ -9116,6 +9634,11 @@ fi 8494@@ -9117,6 +9635,11 @@ fi
8467 8495
8468 8496
8469 8497
@@ -8475,7 +8503,7 @@ index a16c6db059..4277b74bad 100755
8475 # 8503 #
8476 # Check to make sure the static flag actually works. 8504 # Check to make sure the static flag actually works.
8477 # 8505 #
8478@@ -9466,7 +9989,8 @@ _LT_EOF 8506@@ -9467,7 +9990,8 @@ _LT_EOF
8479 allow_undefined_flag=unsupported 8507 allow_undefined_flag=unsupported
8480 always_export_symbols=no 8508 always_export_symbols=no
8481 enable_shared_with_static_runtimes=yes 8509 enable_shared_with_static_runtimes=yes
@@ -8485,7 +8513,7 @@ index a16c6db059..4277b74bad 100755
8485 8513
8486 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8514 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8487 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8515 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8488@@ -9565,12 +10089,12 @@ _LT_EOF 8516@@ -9566,12 +10090,12 @@ _LT_EOF
8489 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8517 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8490 hardcode_libdir_flag_spec= 8518 hardcode_libdir_flag_spec=
8491 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8519 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8500,7 +8528,7 @@ index a16c6db059..4277b74bad 100755
8500 fi 8528 fi
8501 ;; 8529 ;;
8502 esac 8530 esac
8503@@ -9584,8 +10108,8 @@ _LT_EOF 8531@@ -9585,8 +10109,8 @@ _LT_EOF
8504 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8532 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8505 wlarc= 8533 wlarc=
8506 else 8534 else
@@ -8511,7 +8539,7 @@ index a16c6db059..4277b74bad 100755
8511 fi 8539 fi
8512 ;; 8540 ;;
8513 8541
8514@@ -9603,8 +10127,8 @@ _LT_EOF 8542@@ -9604,8 +10128,8 @@ _LT_EOF
8515 8543
8516 _LT_EOF 8544 _LT_EOF
8517 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8545 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8522,7 +8550,7 @@ index a16c6db059..4277b74bad 100755
8522 else 8550 else
8523 ld_shlibs=no 8551 ld_shlibs=no
8524 fi 8552 fi
8525@@ -9650,8 +10174,8 @@ _LT_EOF 8553@@ -9651,8 +10175,8 @@ _LT_EOF
8526 8554
8527 *) 8555 *)
8528 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8556 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8533,7 +8561,7 @@ index a16c6db059..4277b74bad 100755
8533 else 8561 else
8534 ld_shlibs=no 8562 ld_shlibs=no
8535 fi 8563 fi
8536@@ -9781,7 +10305,13 @@ _LT_EOF 8564@@ -9782,7 +10306,13 @@ _LT_EOF
8537 allow_undefined_flag='-berok' 8565 allow_undefined_flag='-berok'
8538 # Determine the default libpath from the value encoded in an 8566 # Determine the default libpath from the value encoded in an
8539 # empty executable. 8567 # empty executable.
@@ -8548,7 +8576,7 @@ index a16c6db059..4277b74bad 100755
8548 /* end confdefs.h. */ 8576 /* end confdefs.h. */
8549 8577
8550 int 8578 int
8551@@ -9794,22 +10324,29 @@ main () 8579@@ -9795,22 +10325,29 @@ main ()
8552 _ACEOF 8580 _ACEOF
8553 if ac_fn_c_try_link "$LINENO"; then : 8581 if ac_fn_c_try_link "$LINENO"; then :
8554 8582
@@ -8591,7 +8619,7 @@ index a16c6db059..4277b74bad 100755
8591 8619
8592 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8620 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8593 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" 8621 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"
8594@@ -9821,7 +10358,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8622@@ -9822,7 +10359,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8595 else 8623 else
8596 # Determine the default libpath from the value encoded in an 8624 # Determine the default libpath from the value encoded in an
8597 # empty executable. 8625 # empty executable.
@@ -8606,7 +8634,7 @@ index a16c6db059..4277b74bad 100755
8606 /* end confdefs.h. */ 8634 /* end confdefs.h. */
8607 8635
8608 int 8636 int
8609@@ -9834,22 +10377,29 @@ main () 8637@@ -9835,22 +10378,29 @@ main ()
8610 _ACEOF 8638 _ACEOF
8611 if ac_fn_c_try_link "$LINENO"; then : 8639 if ac_fn_c_try_link "$LINENO"; then :
8612 8640
@@ -8649,7 +8677,7 @@ index a16c6db059..4277b74bad 100755
8649 8677
8650 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8678 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8651 # Warning - without using the other run time loading flags, 8679 # Warning - without using the other run time loading flags,
8652@@ -9893,21 +10443,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8680@@ -9894,21 +10444,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8653 # When not using gcc, we currently assume that we are using 8681 # When not using gcc, we currently assume that we are using
8654 # Microsoft Visual C++. 8682 # Microsoft Visual C++.
8655 # hardcode_libdir_flag_spec is actually meaningless, as there is 8683 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8729,7 +8757,7 @@ index a16c6db059..4277b74bad 100755
8729 ;; 8757 ;;
8730 8758
8731 darwin* | rhapsody*) 8759 darwin* | rhapsody*)
8732@@ -9968,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8760@@ -9969,7 +10562,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8733 8761
8734 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8762 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8735 freebsd* | dragonfly*) 8763 freebsd* | dragonfly*)
@@ -8738,7 +8766,7 @@ index a16c6db059..4277b74bad 100755
8738 hardcode_libdir_flag_spec='-R$libdir' 8766 hardcode_libdir_flag_spec='-R$libdir'
8739 hardcode_direct=yes 8767 hardcode_direct=yes
8740 hardcode_shlibpath_var=no 8768 hardcode_shlibpath_var=no
8741@@ -9976,7 +10569,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8769@@ -9977,7 +10570,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8742 8770
8743 hpux9*) 8771 hpux9*)
8744 if test "$GCC" = yes; then 8772 if test "$GCC" = yes; then
@@ -8747,7 +8775,7 @@ index a16c6db059..4277b74bad 100755
8747 else 8775 else
8748 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' 8776 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'
8749 fi 8777 fi
8750@@ -9992,7 +10585,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8778@@ -9993,7 +10586,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8751 8779
8752 hpux10*) 8780 hpux10*)
8753 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8781 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8756,7 +8784,7 @@ index a16c6db059..4277b74bad 100755
8756 else 8784 else
8757 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8785 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8758 fi 8786 fi
8759@@ -10016,10 +10609,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8787@@ -10017,10 +10610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8760 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8788 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8761 ;; 8789 ;;
8762 ia64*) 8790 ia64*)
@@ -8769,7 +8797,7 @@ index a16c6db059..4277b74bad 100755
8769 ;; 8797 ;;
8770 esac 8798 esac
8771 else 8799 else
8772@@ -10098,23 +10691,36 @@ fi 8800@@ -10099,23 +10692,36 @@ fi
8773 8801
8774 irix5* | irix6* | nonstopux*) 8802 irix5* | irix6* | nonstopux*)
8775 if test "$GCC" = yes; then 8803 if test "$GCC" = yes; then
@@ -8814,7 +8842,7 @@ index a16c6db059..4277b74bad 100755
8814 else 8842 else
8815 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' 8843 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'
8816 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' 8844 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'
8817@@ -10199,7 +10805,7 @@ rm -f core conftest.err conftest.$ac_objext \ 8845@@ -10200,7 +10806,7 @@ rm -f core conftest.err conftest.$ac_objext \
8818 osf4* | osf5*) # as osf3* with the addition of -msym flag 8846 osf4* | osf5*) # as osf3* with the addition of -msym flag
8819 if test "$GCC" = yes; then 8847 if test "$GCC" = yes; then
8820 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8848 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8823,7 +8851,7 @@ index a16c6db059..4277b74bad 100755
8823 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8851 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8824 else 8852 else
8825 allow_undefined_flag=' -expect_unresolved \*' 8853 allow_undefined_flag=' -expect_unresolved \*'
8826@@ -10218,9 +10824,9 @@ rm -f core conftest.err conftest.$ac_objext \ 8854@@ -10219,9 +10825,9 @@ rm -f core conftest.err conftest.$ac_objext \
8827 no_undefined_flag=' -z defs' 8855 no_undefined_flag=' -z defs'
8828 if test "$GCC" = yes; then 8856 if test "$GCC" = yes; then
8829 wlarc='${wl}' 8857 wlarc='${wl}'
@@ -8835,7 +8863,7 @@ index a16c6db059..4277b74bad 100755
8835 else 8863 else
8836 case `$CC -V 2>&1` in 8864 case `$CC -V 2>&1` in
8837 *"Compilers 5.0"*) 8865 *"Compilers 5.0"*)
8838@@ -10796,8 +11402,9 @@ cygwin* | mingw* | pw32* | cegcc*) 8866@@ -10797,8 +11403,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8839 need_version=no 8867 need_version=no
8840 need_lib_prefix=no 8868 need_lib_prefix=no
8841 8869
@@ -8847,7 +8875,7 @@ index a16c6db059..4277b74bad 100755
8847 library_names_spec='$libname.dll.a' 8875 library_names_spec='$libname.dll.a'
8848 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8876 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8849 postinstall_cmds='base_file=`basename \${file}`~ 8877 postinstall_cmds='base_file=`basename \${file}`~
8850@@ -10830,13 +11437,71 @@ cygwin* | mingw* | pw32* | cegcc*) 8878@@ -10831,13 +11438,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8851 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8879 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8852 ;; 8880 ;;
8853 esac 8881 esac
@@ -8920,7 +8948,7 @@ index a16c6db059..4277b74bad 100755
8920 # FIXME: first we should search . and the directory the executable is in 8948 # FIXME: first we should search . and the directory the executable is in
8921 shlibpath_var=PATH 8949 shlibpath_var=PATH
8922 ;; 8950 ;;
8923@@ -10928,7 +11593,7 @@ haiku*) 8951@@ -10929,7 +11594,7 @@ haiku*)
8924 soname_spec='${libname}${release}${shared_ext}$major' 8952 soname_spec='${libname}${release}${shared_ext}$major'
8925 shlibpath_var=LIBRARY_PATH 8953 shlibpath_var=LIBRARY_PATH
8926 shlibpath_overrides_runpath=yes 8954 shlibpath_overrides_runpath=yes
@@ -8929,7 +8957,7 @@ index a16c6db059..4277b74bad 100755
8929 hardcode_into_libs=yes 8957 hardcode_into_libs=yes
8930 ;; 8958 ;;
8931 8959
8932@@ -11768,10 +12433,10 @@ else 8960@@ -11769,10 +12434,10 @@ else
8933 /* When -fvisbility=hidden is used, assume the code has been annotated 8961 /* When -fvisbility=hidden is used, assume the code has been annotated
8934 correspondingly for the symbols needed. */ 8962 correspondingly for the symbols needed. */
8935 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 8963 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -8942,7 +8970,7 @@ index a16c6db059..4277b74bad 100755
8942 int main () 8970 int main ()
8943 { 8971 {
8944 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 8972 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8945@@ -11874,10 +12539,10 @@ else 8973@@ -11875,10 +12540,10 @@ else
8946 /* When -fvisbility=hidden is used, assume the code has been annotated 8974 /* When -fvisbility=hidden is used, assume the code has been annotated
8947 correspondingly for the symbols needed. */ 8975 correspondingly for the symbols needed. */
8948 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 8976 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -8955,7 +8983,7 @@ index a16c6db059..4277b74bad 100755
8955 int main () 8983 int main ()
8956 { 8984 {
8957 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 8985 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8958@@ -12269,6 +12934,7 @@ $RM -r conftest* 8986@@ -12270,6 +12935,7 @@ $RM -r conftest*
8959 8987
8960 # Allow CC to be a program name with arguments. 8988 # Allow CC to be a program name with arguments.
8961 lt_save_CC=$CC 8989 lt_save_CC=$CC
@@ -8963,7 +8991,7 @@ index a16c6db059..4277b74bad 100755
8963 lt_save_LD=$LD 8991 lt_save_LD=$LD
8964 lt_save_GCC=$GCC 8992 lt_save_GCC=$GCC
8965 GCC=$GXX 8993 GCC=$GXX
8966@@ -12286,6 +12952,7 @@ $RM -r conftest* 8994@@ -12287,6 +12953,7 @@ $RM -r conftest*
8967 fi 8995 fi
8968 test -z "${LDCXX+set}" || LD=$LDCXX 8996 test -z "${LDCXX+set}" || LD=$LDCXX
8969 CC=${CXX-"c++"} 8997 CC=${CXX-"c++"}
@@ -8971,7 +8999,7 @@ index a16c6db059..4277b74bad 100755
8971 compiler=$CC 8999 compiler=$CC
8972 compiler_CXX=$CC 9000 compiler_CXX=$CC
8973 for cc_temp in $compiler""; do 9001 for cc_temp in $compiler""; do
8974@@ -12568,7 +13235,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9002@@ -12569,7 +13236,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8975 allow_undefined_flag_CXX='-berok' 9003 allow_undefined_flag_CXX='-berok'
8976 # Determine the default libpath from the value encoded in an empty 9004 # Determine the default libpath from the value encoded in an empty
8977 # executable. 9005 # executable.
@@ -8986,7 +9014,7 @@ index a16c6db059..4277b74bad 100755
8986 /* end confdefs.h. */ 9014 /* end confdefs.h. */
8987 9015
8988 int 9016 int
8989@@ -12581,22 +13254,29 @@ main () 9017@@ -12582,22 +13255,29 @@ main ()
8990 _ACEOF 9018 _ACEOF
8991 if ac_fn_cxx_try_link "$LINENO"; then : 9019 if ac_fn_cxx_try_link "$LINENO"; then :
8992 9020
@@ -9029,7 +9057,7 @@ index a16c6db059..4277b74bad 100755
9029 9057
9030 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9058 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9031 9059
9032@@ -12609,7 +13289,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9060@@ -12610,7 +13290,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9033 else 9061 else
9034 # Determine the default libpath from the value encoded in an 9062 # Determine the default libpath from the value encoded in an
9035 # empty executable. 9063 # empty executable.
@@ -9044,7 +9072,7 @@ index a16c6db059..4277b74bad 100755
9044 /* end confdefs.h. */ 9072 /* end confdefs.h. */
9045 9073
9046 int 9074 int
9047@@ -12622,22 +13308,29 @@ main () 9075@@ -12623,22 +13309,29 @@ main ()
9048 _ACEOF 9076 _ACEOF
9049 if ac_fn_cxx_try_link "$LINENO"; then : 9077 if ac_fn_cxx_try_link "$LINENO"; then :
9050 9078
@@ -9087,7 +9115,7 @@ index a16c6db059..4277b74bad 100755
9087 9115
9088 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9116 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9089 # Warning - without using the other run time loading flags, 9117 # Warning - without using the other run time loading flags,
9090@@ -12680,29 +13373,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9118@@ -12681,29 +13374,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9091 ;; 9119 ;;
9092 9120
9093 cygwin* | mingw* | pw32* | cegcc*) 9121 cygwin* | mingw* | pw32* | cegcc*)
@@ -9186,7 +9214,7 @@ index a16c6db059..4277b74bad 100755
9186 darwin* | rhapsody*) 9214 darwin* | rhapsody*)
9187 9215
9188 9216
9189@@ -12808,7 +13547,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9217@@ -12809,7 +13548,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9190 ;; 9218 ;;
9191 *) 9219 *)
9192 if test "$GXX" = yes; then 9220 if test "$GXX" = yes; then
@@ -9195,7 +9223,7 @@ index a16c6db059..4277b74bad 100755
9195 else 9223 else
9196 # FIXME: insert proper C++ library support 9224 # FIXME: insert proper C++ library support
9197 ld_shlibs_CXX=no 9225 ld_shlibs_CXX=no
9198@@ -12879,10 +13618,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9226@@ -12880,10 +13619,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9199 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9227 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9200 ;; 9228 ;;
9201 ia64*) 9229 ia64*)
@@ -9208,7 +9236,7 @@ index a16c6db059..4277b74bad 100755
9208 ;; 9236 ;;
9209 esac 9237 esac
9210 fi 9238 fi
9211@@ -12923,9 +13662,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9239@@ -12924,9 +13663,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9212 *) 9240 *)
9213 if test "$GXX" = yes; then 9241 if test "$GXX" = yes; then
9214 if test "$with_gnu_ld" = no; then 9242 if test "$with_gnu_ld" = no; then
@@ -9220,7 +9248,7 @@ index a16c6db059..4277b74bad 100755
9220 fi 9248 fi
9221 fi 9249 fi
9222 link_all_deplibs_CXX=yes 9250 link_all_deplibs_CXX=yes
9223@@ -12995,20 +13734,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9251@@ -12996,20 +13735,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9224 prelink_cmds_CXX='tpldir=Template.dir~ 9252 prelink_cmds_CXX='tpldir=Template.dir~
9225 rm -rf $tpldir~ 9253 rm -rf $tpldir~
9226 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9254 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9245,7 +9273,7 @@ index a16c6db059..4277b74bad 100755
9245 ;; 9273 ;;
9246 *) # Version 6 and above use weak symbols 9274 *) # Version 6 and above use weak symbols
9247 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9275 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9248@@ -13203,7 +13942,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9276@@ -13204,7 +13943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9249 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' 9277 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'
9250 ;; 9278 ;;
9251 *) 9279 *)
@@ -9254,7 +9282,7 @@ index a16c6db059..4277b74bad 100755
9254 ;; 9282 ;;
9255 esac 9283 esac
9256 9284
9257@@ -13249,7 +13988,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9285@@ -13250,7 +13989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9258 9286
9259 solaris*) 9287 solaris*)
9260 case $cc_basename in 9288 case $cc_basename in
@@ -9263,7 +9291,7 @@ index a16c6db059..4277b74bad 100755
9263 # Sun C++ 4.2, 5.x and Centerline C++ 9291 # Sun C++ 4.2, 5.x and Centerline C++
9264 archive_cmds_need_lc_CXX=yes 9292 archive_cmds_need_lc_CXX=yes
9265 no_undefined_flag_CXX=' -zdefs' 9293 no_undefined_flag_CXX=' -zdefs'
9266@@ -13290,9 +14029,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9294@@ -13291,9 +14030,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9267 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9295 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9268 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9296 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9269 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9297 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9275,7 +9303,7 @@ index a16c6db059..4277b74bad 100755
9275 9303
9276 # Commands to make compiler produce verbose output that lists 9304 # Commands to make compiler produce verbose output that lists
9277 # what "hidden" libraries, object files and flags are used when 9305 # what "hidden" libraries, object files and flags are used when
9278@@ -13427,6 +14166,13 @@ private: 9306@@ -13428,6 +14167,13 @@ private:
9279 }; 9307 };
9280 _LT_EOF 9308 _LT_EOF
9281 9309
@@ -9289,7 +9317,7 @@ index a16c6db059..4277b74bad 100755
9289 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9317 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9290 (eval $ac_compile) 2>&5 9318 (eval $ac_compile) 2>&5
9291 ac_status=$? 9319 ac_status=$?
9292@@ -13440,7 +14186,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9320@@ -13441,7 +14187,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9293 pre_test_object_deps_done=no 9321 pre_test_object_deps_done=no
9294 9322
9295 for p in `eval "$output_verbose_link_cmd"`; do 9323 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9298,7 +9326,7 @@ index a16c6db059..4277b74bad 100755
9298 9326
9299 -L* | -R* | -l*) 9327 -L* | -R* | -l*)
9300 # Some compilers place space between "-{L,R}" and the path. 9328 # Some compilers place space between "-{L,R}" and the path.
9301@@ -13449,13 +14195,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9329@@ -13450,13 +14196,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9302 test $p = "-R"; then 9330 test $p = "-R"; then
9303 prev=$p 9331 prev=$p
9304 continue 9332 continue
@@ -9325,7 +9353,7 @@ index a16c6db059..4277b74bad 100755
9325 # Internal compiler library paths should come after those 9353 # Internal compiler library paths should come after those
9326 # provided the user. The postdeps already come after the 9354 # provided the user. The postdeps already come after the
9327 # user supplied libs so there is no need to process them. 9355 # user supplied libs so there is no need to process them.
9328@@ -13475,8 +14230,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9356@@ -13476,8 +14231,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9329 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9357 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9330 fi 9358 fi
9331 fi 9359 fi
@@ -9336,7 +9364,7 @@ index a16c6db059..4277b74bad 100755
9336 *.$objext) 9364 *.$objext)
9337 # This assumes that the test object file only shows up 9365 # This assumes that the test object file only shows up
9338 # once in the compiler output. 9366 # once in the compiler output.
9339@@ -13512,6 +14269,7 @@ else 9367@@ -13513,6 +14270,7 @@ else
9340 fi 9368 fi
9341 9369
9342 $RM -f confest.$objext 9370 $RM -f confest.$objext
@@ -9344,7 +9372,7 @@ index a16c6db059..4277b74bad 100755
9344 9372
9345 # PORTME: override above test on systems where it is broken 9373 # PORTME: override above test on systems where it is broken
9346 case $host_os in 9374 case $host_os in
9347@@ -13547,7 +14305,7 @@ linux*) 9375@@ -13548,7 +14306,7 @@ linux*)
9348 9376
9349 solaris*) 9377 solaris*)
9350 case $cc_basename in 9378 case $cc_basename in
@@ -9353,7 +9381,7 @@ index a16c6db059..4277b74bad 100755
9353 # The more standards-conforming stlport4 library is 9381 # The more standards-conforming stlport4 library is
9354 # incompatible with the Cstd library. Avoid specifying 9382 # incompatible with the Cstd library. Avoid specifying
9355 # it if it's in CXXFLAGS. Ignore libCrun as 9383 # it if it's in CXXFLAGS. Ignore libCrun as
9356@@ -13612,8 +14370,6 @@ fi 9384@@ -13613,8 +14371,6 @@ fi
9357 lt_prog_compiler_pic_CXX= 9385 lt_prog_compiler_pic_CXX=
9358 lt_prog_compiler_static_CXX= 9386 lt_prog_compiler_static_CXX=
9359 9387
@@ -9362,7 +9390,7 @@ index a16c6db059..4277b74bad 100755
9362 9390
9363 # C++ specific cases for pic, static, wl, etc. 9391 # C++ specific cases for pic, static, wl, etc.
9364 if test "$GXX" = yes; then 9392 if test "$GXX" = yes; then
9365@@ -13718,6 +14474,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9393@@ -13719,6 +14475,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9366 ;; 9394 ;;
9367 esac 9395 esac
9368 ;; 9396 ;;
@@ -9374,7 +9402,7 @@ index a16c6db059..4277b74bad 100755
9374 dgux*) 9402 dgux*)
9375 case $cc_basename in 9403 case $cc_basename in
9376 ec++*) 9404 ec++*)
9377@@ -13870,7 +14631,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9405@@ -13871,7 +14632,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9378 ;; 9406 ;;
9379 solaris*) 9407 solaris*)
9380 case $cc_basename in 9408 case $cc_basename in
@@ -9383,7 +9411,7 @@ index a16c6db059..4277b74bad 100755
9383 # Sun C++ 4.2, 5.x and Centerline C++ 9411 # Sun C++ 4.2, 5.x and Centerline C++
9384 lt_prog_compiler_pic_CXX='-KPIC' 9412 lt_prog_compiler_pic_CXX='-KPIC'
9385 lt_prog_compiler_static_CXX='-Bstatic' 9413 lt_prog_compiler_static_CXX='-Bstatic'
9386@@ -13935,10 +14696,17 @@ case $host_os in 9414@@ -13936,10 +14697,17 @@ case $host_os in
9387 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9415 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9388 ;; 9416 ;;
9389 esac 9417 esac
@@ -9404,7 +9432,7 @@ index a16c6db059..4277b74bad 100755
9404 9432
9405 # 9433 #
9406 # Check to make sure the PIC flag actually works. 9434 # Check to make sure the PIC flag actually works.
9407@@ -13996,6 +14764,8 @@ fi 9435@@ -13997,6 +14765,8 @@ fi
9408 9436
9409 9437
9410 9438
@@ -9413,7 +9441,7 @@ index a16c6db059..4277b74bad 100755
9413 # 9441 #
9414 # Check to make sure the static flag actually works. 9442 # Check to make sure the static flag actually works.
9415 # 9443 #
9416@@ -14173,6 +14943,7 @@ fi 9444@@ -14174,6 +14944,7 @@ fi
9417 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9445 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9418 9446
9419 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9447 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9421,7 +9449,7 @@ index a16c6db059..4277b74bad 100755
9421 case $host_os in 9449 case $host_os in
9422 aix[4-9]*) 9450 aix[4-9]*)
9423 # If we're using GNU nm, then we don't want the "-C" option. 9451 # If we're using GNU nm, then we don't want the "-C" option.
9424@@ -14187,15 +14958,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9452@@ -14188,15 +14959,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9425 ;; 9453 ;;
9426 pw32*) 9454 pw32*)
9427 export_symbols_cmds_CXX="$ltdll_cmds" 9455 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9447,7 +9475,7 @@ index a16c6db059..4277b74bad 100755
9447 9475
9448 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9476 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9449 $as_echo "$ld_shlibs_CXX" >&6; } 9477 $as_echo "$ld_shlibs_CXX" >&6; }
9450@@ -14458,8 +15234,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9478@@ -14459,8 +15235,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9451 need_version=no 9479 need_version=no
9452 need_lib_prefix=no 9480 need_lib_prefix=no
9453 9481
@@ -9459,7 +9487,7 @@ index a16c6db059..4277b74bad 100755
9459 library_names_spec='$libname.dll.a' 9487 library_names_spec='$libname.dll.a'
9460 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9488 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9461 postinstall_cmds='base_file=`basename \${file}`~ 9489 postinstall_cmds='base_file=`basename \${file}`~
9462@@ -14491,13 +15268,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9490@@ -14492,13 +15269,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9463 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9491 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9464 ;; 9492 ;;
9465 esac 9493 esac
@@ -9532,7 +9560,7 @@ index a16c6db059..4277b74bad 100755
9532 # FIXME: first we should search . and the directory the executable is in 9560 # FIXME: first we should search . and the directory the executable is in
9533 shlibpath_var=PATH 9561 shlibpath_var=PATH
9534 ;; 9562 ;;
9535@@ -14588,7 +15423,7 @@ haiku*) 9563@@ -14589,7 +15424,7 @@ haiku*)
9536 soname_spec='${libname}${release}${shared_ext}$major' 9564 soname_spec='${libname}${release}${shared_ext}$major'
9537 shlibpath_var=LIBRARY_PATH 9565 shlibpath_var=LIBRARY_PATH
9538 shlibpath_overrides_runpath=yes 9566 shlibpath_overrides_runpath=yes
@@ -9541,7 +9569,7 @@ index a16c6db059..4277b74bad 100755
9541 hardcode_into_libs=yes 9569 hardcode_into_libs=yes
9542 ;; 9570 ;;
9543 9571
9544@@ -15047,6 +15882,7 @@ fi 9572@@ -15048,6 +15883,7 @@ fi
9545 fi # test -n "$compiler" 9573 fi # test -n "$compiler"
9546 9574
9547 CC=$lt_save_CC 9575 CC=$lt_save_CC
@@ -9549,7 +9577,7 @@ index a16c6db059..4277b74bad 100755
9549 LDCXX=$LD 9577 LDCXX=$LD
9550 LD=$lt_save_LD 9578 LD=$lt_save_LD
9551 GCC=$lt_save_GCC 9579 GCC=$lt_save_GCC
9552@@ -18026,13 +18862,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9580@@ -18083,13 +18919,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9553 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9581 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9554 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9582 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9555 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9583 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9570,7 +9598,7 @@ index a16c6db059..4277b74bad 100755
9570 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9598 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9571 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9599 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9572 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9600 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9573@@ -18047,14 +18890,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9601@@ -18104,14 +18947,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9574 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9602 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9575 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9603 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9576 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"`' 9604 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"`'
@@ -9589,7 +9617,7 @@ index a16c6db059..4277b74bad 100755
9589 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9617 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9590 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9618 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9591 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9619 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9592@@ -18087,12 +18933,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9620@@ -18144,12 +18990,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9593 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9621 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9594 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9622 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9595 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9623 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9603,7 +9631,7 @@ index a16c6db059..4277b74bad 100755
9603 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9631 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9604 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9632 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9605 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9633 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9606@@ -18131,8 +18977,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9634@@ -18188,8 +19034,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9607 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9635 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9608 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9636 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9609 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9637 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9613,7 +9641,7 @@ index a16c6db059..4277b74bad 100755
9613 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9641 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9614 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9642 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9615 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9643 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9616@@ -18159,12 +19005,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9644@@ -18216,12 +19062,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9617 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9645 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9618 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9646 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9619 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9647 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9627,7 +9655,7 @@ index a16c6db059..4277b74bad 100755
9627 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9655 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9628 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9656 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9629 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9657 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9630@@ -18202,8 +19048,13 @@ reload_flag \ 9658@@ -18259,8 +19105,13 @@ reload_flag \
9631 OBJDUMP \ 9659 OBJDUMP \
9632 deplibs_check_method \ 9660 deplibs_check_method \
9633 file_magic_cmd \ 9661 file_magic_cmd \
@@ -9641,7 +9669,7 @@ index a16c6db059..4277b74bad 100755
9641 STRIP \ 9669 STRIP \
9642 RANLIB \ 9670 RANLIB \
9643 CC \ 9671 CC \
9644@@ -18213,12 +19064,14 @@ lt_cv_sys_global_symbol_pipe \ 9672@@ -18270,12 +19121,14 @@ lt_cv_sys_global_symbol_pipe \
9645 lt_cv_sys_global_symbol_to_cdecl \ 9673 lt_cv_sys_global_symbol_to_cdecl \
9646 lt_cv_sys_global_symbol_to_c_name_address \ 9674 lt_cv_sys_global_symbol_to_c_name_address \
9647 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9675 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9657,7 +9685,7 @@ index a16c6db059..4277b74bad 100755
9657 DSYMUTIL \ 9685 DSYMUTIL \
9658 NMEDIT \ 9686 NMEDIT \
9659 LIPO \ 9687 LIPO \
9660@@ -18234,7 +19087,6 @@ no_undefined_flag \ 9688@@ -18291,7 +19144,6 @@ no_undefined_flag \
9661 hardcode_libdir_flag_spec \ 9689 hardcode_libdir_flag_spec \
9662 hardcode_libdir_flag_spec_ld \ 9690 hardcode_libdir_flag_spec_ld \
9663 hardcode_libdir_separator \ 9691 hardcode_libdir_separator \
@@ -9665,7 +9693,7 @@ index a16c6db059..4277b74bad 100755
9665 exclude_expsyms \ 9693 exclude_expsyms \
9666 include_expsyms \ 9694 include_expsyms \
9667 file_list_spec \ 9695 file_list_spec \
9668@@ -18256,8 +19108,8 @@ LD_CXX \ 9696@@ -18313,8 +19165,8 @@ LD_CXX \
9669 reload_flag_CXX \ 9697 reload_flag_CXX \
9670 compiler_CXX \ 9698 compiler_CXX \
9671 lt_prog_compiler_no_builtin_flag_CXX \ 9699 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9675,7 +9703,7 @@ index a16c6db059..4277b74bad 100755
9675 lt_prog_compiler_static_CXX \ 9703 lt_prog_compiler_static_CXX \
9676 lt_cv_prog_compiler_c_o_CXX \ 9704 lt_cv_prog_compiler_c_o_CXX \
9677 export_dynamic_flag_spec_CXX \ 9705 export_dynamic_flag_spec_CXX \
9678@@ -18269,7 +19121,6 @@ no_undefined_flag_CXX \ 9706@@ -18326,7 +19178,6 @@ no_undefined_flag_CXX \
9679 hardcode_libdir_flag_spec_CXX \ 9707 hardcode_libdir_flag_spec_CXX \
9680 hardcode_libdir_flag_spec_ld_CXX \ 9708 hardcode_libdir_flag_spec_ld_CXX \
9681 hardcode_libdir_separator_CXX \ 9709 hardcode_libdir_separator_CXX \
@@ -9683,7 +9711,7 @@ index a16c6db059..4277b74bad 100755
9683 exclude_expsyms_CXX \ 9711 exclude_expsyms_CXX \
9684 include_expsyms_CXX \ 9712 include_expsyms_CXX \
9685 file_list_spec_CXX \ 9713 file_list_spec_CXX \
9686@@ -18303,6 +19154,7 @@ module_cmds \ 9714@@ -18360,6 +19211,7 @@ module_cmds \
9687 module_expsym_cmds \ 9715 module_expsym_cmds \
9688 export_symbols_cmds \ 9716 export_symbols_cmds \
9689 prelink_cmds \ 9717 prelink_cmds \
@@ -9691,7 +9719,7 @@ index a16c6db059..4277b74bad 100755
9691 postinstall_cmds \ 9719 postinstall_cmds \
9692 postuninstall_cmds \ 9720 postuninstall_cmds \
9693 finish_cmds \ 9721 finish_cmds \
9694@@ -18317,7 +19169,8 @@ archive_expsym_cmds_CXX \ 9722@@ -18374,7 +19226,8 @@ archive_expsym_cmds_CXX \
9695 module_cmds_CXX \ 9723 module_cmds_CXX \
9696 module_expsym_cmds_CXX \ 9724 module_expsym_cmds_CXX \
9697 export_symbols_cmds_CXX \ 9725 export_symbols_cmds_CXX \
@@ -9701,7 +9729,7 @@ index a16c6db059..4277b74bad 100755
9701 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9729 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9702 *[\\\\\\\`\\"\\\$]*) 9730 *[\\\\\\\`\\"\\\$]*)
9703 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9731 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9704@@ -19110,7 +19963,8 @@ $as_echo X"$file" | 9732@@ -19167,7 +20020,8 @@ $as_echo X"$file" |
9705 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9733 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9706 # 9734 #
9707 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9735 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9711,7 +9739,7 @@ index a16c6db059..4277b74bad 100755
9711 # Written by Gordon Matzigkeit, 1996 9739 # Written by Gordon Matzigkeit, 1996
9712 # 9740 #
9713 # This file is part of GNU Libtool. 9741 # This file is part of GNU Libtool.
9714@@ -19213,19 +20067,42 @@ SP2NL=$lt_lt_SP2NL 9742@@ -19270,19 +20124,42 @@ SP2NL=$lt_lt_SP2NL
9715 # turn newlines into spaces. 9743 # turn newlines into spaces.
9716 NL2SP=$lt_lt_NL2SP 9744 NL2SP=$lt_lt_NL2SP
9717 9745
@@ -9755,7 +9783,7 @@ index a16c6db059..4277b74bad 100755
9755 # A symbol stripping program. 9783 # A symbol stripping program.
9756 STRIP=$lt_STRIP 9784 STRIP=$lt_STRIP
9757 9785
9758@@ -19255,6 +20132,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9786@@ -19312,6 +20189,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9759 # Transform the output of nm in a C name address pair when lib prefix is needed. 9787 # Transform the output of nm in a C name address pair when lib prefix is needed.
9760 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9788 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9761 9789
@@ -9768,7 +9796,7 @@ index a16c6db059..4277b74bad 100755
9768 # The name of the directory that contains temporary libtool files. 9796 # The name of the directory that contains temporary libtool files.
9769 objdir=$objdir 9797 objdir=$objdir
9770 9798
9771@@ -19264,6 +20147,9 @@ MAGIC_CMD=$MAGIC_CMD 9799@@ -19321,6 +20204,9 @@ MAGIC_CMD=$MAGIC_CMD
9772 # Must we lock files when doing compilation? 9800 # Must we lock files when doing compilation?
9773 need_locks=$lt_need_locks 9801 need_locks=$lt_need_locks
9774 9802
@@ -9778,7 +9806,7 @@ index a16c6db059..4277b74bad 100755
9778 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9806 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9779 DSYMUTIL=$lt_DSYMUTIL 9807 DSYMUTIL=$lt_DSYMUTIL
9780 9808
9781@@ -19378,12 +20264,12 @@ with_gcc=$GCC 9809@@ -19435,12 +20321,12 @@ with_gcc=$GCC
9782 # Compiler flag to turn off builtin functions. 9810 # Compiler flag to turn off builtin functions.
9783 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9811 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9784 9812
@@ -9794,7 +9822,7 @@ index a16c6db059..4277b74bad 100755
9794 # Compiler flag to prevent dynamic linking. 9822 # Compiler flag to prevent dynamic linking.
9795 link_static_flag=$lt_lt_prog_compiler_static 9823 link_static_flag=$lt_lt_prog_compiler_static
9796 9824
9797@@ -19470,9 +20356,6 @@ inherit_rpath=$inherit_rpath 9825@@ -19527,9 +20413,6 @@ inherit_rpath=$inherit_rpath
9798 # Whether libtool must link a program against all its dependency libraries. 9826 # Whether libtool must link a program against all its dependency libraries.
9799 link_all_deplibs=$link_all_deplibs 9827 link_all_deplibs=$link_all_deplibs
9800 9828
@@ -9804,7 +9832,7 @@ index a16c6db059..4277b74bad 100755
9804 # Set to "yes" if exported symbols are required. 9832 # Set to "yes" if exported symbols are required.
9805 always_export_symbols=$always_export_symbols 9833 always_export_symbols=$always_export_symbols
9806 9834
9807@@ -19488,6 +20371,9 @@ include_expsyms=$lt_include_expsyms 9835@@ -19545,6 +20428,9 @@ include_expsyms=$lt_include_expsyms
9808 # Commands necessary for linking programs (against libraries) with templates. 9836 # Commands necessary for linking programs (against libraries) with templates.
9809 prelink_cmds=$lt_prelink_cmds 9837 prelink_cmds=$lt_prelink_cmds
9810 9838
@@ -9814,7 +9842,7 @@ index a16c6db059..4277b74bad 100755
9814 # Specify filename containing input files. 9842 # Specify filename containing input files.
9815 file_list_spec=$lt_file_list_spec 9843 file_list_spec=$lt_file_list_spec
9816 9844
9817@@ -19534,210 +20420,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 9845@@ -19591,210 +20477,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9818 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9846 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9819 # text mode, it properly converts lines to CR/LF. This bash problem 9847 # text mode, it properly converts lines to CR/LF. This bash problem
9820 # is reportedly fixed, but why not run on old versions too? 9848 # is reportedly fixed, but why not run on old versions too?
@@ -10188,7 +10216,7 @@ index a16c6db059..4277b74bad 100755
10188 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10216 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10189 chmod +x "$ofile" 10217 chmod +x "$ofile"
10190 10218
10191@@ -19765,12 +20610,12 @@ with_gcc=$GCC_CXX 10219@@ -19822,12 +20667,12 @@ with_gcc=$GCC_CXX
10192 # Compiler flag to turn off builtin functions. 10220 # Compiler flag to turn off builtin functions.
10193 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10221 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10194 10222
@@ -10204,7 +10232,7 @@ index a16c6db059..4277b74bad 100755
10204 # Compiler flag to prevent dynamic linking. 10232 # Compiler flag to prevent dynamic linking.
10205 link_static_flag=$lt_lt_prog_compiler_static_CXX 10233 link_static_flag=$lt_lt_prog_compiler_static_CXX
10206 10234
10207@@ -19857,9 +20702,6 @@ inherit_rpath=$inherit_rpath_CXX 10235@@ -19914,9 +20759,6 @@ inherit_rpath=$inherit_rpath_CXX
10208 # Whether libtool must link a program against all its dependency libraries. 10236 # Whether libtool must link a program against all its dependency libraries.
10209 link_all_deplibs=$link_all_deplibs_CXX 10237 link_all_deplibs=$link_all_deplibs_CXX
10210 10238
@@ -10214,7 +10242,7 @@ index a16c6db059..4277b74bad 100755
10214 # Set to "yes" if exported symbols are required. 10242 # Set to "yes" if exported symbols are required.
10215 always_export_symbols=$always_export_symbols_CXX 10243 always_export_symbols=$always_export_symbols_CXX
10216 10244
10217@@ -19875,6 +20717,9 @@ include_expsyms=$lt_include_expsyms_CXX 10245@@ -19932,6 +20774,9 @@ include_expsyms=$lt_include_expsyms_CXX
10218 # Commands necessary for linking programs (against libraries) with templates. 10246 # Commands necessary for linking programs (against libraries) with templates.
10219 prelink_cmds=$lt_prelink_cmds_CXX 10247 prelink_cmds=$lt_prelink_cmds_CXX
10220 10248
@@ -17308,7 +17336,7 @@ index bf92b5e079..c573da90c5 100644
17308 # These exist entirely to fool aclocal when bootstrapping libtool. 17336 # These exist entirely to fool aclocal when bootstrapping libtool.
17309 # 17337 #
17310diff --git a/opcodes/configure b/opcodes/configure 17338diff --git a/opcodes/configure b/opcodes/configure
17311index 0b352a454d..7eaea7db73 100755 17339index 17530f54b9..79b39611c2 100755
17312--- a/opcodes/configure 17340--- a/opcodes/configure
17313+++ b/opcodes/configure 17341+++ b/opcodes/configure
17314@@ -650,6 +650,9 @@ OTOOL 17342@@ -650,6 +650,9 @@ OTOOL
@@ -17494,7 +17522,7 @@ index 0b352a454d..7eaea7db73 100755
17494 file_magic_cmd=$lt_cv_file_magic_cmd 17522 file_magic_cmd=$lt_cv_file_magic_cmd
17495 deplibs_check_method=$lt_cv_deplibs_check_method 17523 deplibs_check_method=$lt_cv_deplibs_check_method
17496 test -z "$deplibs_check_method" && deplibs_check_method=unknown 17524 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17497@@ -6245,9 +6346,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 17525@@ -6243,11 +6344,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
17498 17526
17499 17527
17500 17528
@@ -17508,6 +17536,8 @@ index 0b352a454d..7eaea7db73 100755
17508+ 17536+
17509+ 17537+
17510+ 17538+
17539
17540
17511 if test -n "$ac_tool_prefix"; then 17541 if test -n "$ac_tool_prefix"; then
17512- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 17542- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17513-set dummy ${ac_tool_prefix}ar; ac_word=$2 17543-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -17870,12 +17900,17 @@ index 0b352a454d..7eaea7db73 100755
17870 17900
17871 17901
17872 17902
17873@@ -6869,6 +7210,45 @@ fi 17903@@ -6864,6 +7205,45 @@ fi
17874 17904
17875 17905
17876 17906
17877+ 17907+
17878+ 17908+
17909+
17910+
17911+
17912+
17913+
17879+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 17914+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17880+$as_echo_n "checking for sysroot... " >&6; } 17915+$as_echo_n "checking for sysroot... " >&6; }
17881+ 17916+
@@ -17908,14 +17943,9 @@ index 0b352a454d..7eaea7db73 100755
17908+ 17943+
17909+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 17944+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
17910+$as_echo "${lt_sysroot:-no}" >&6; } 17945+$as_echo "${lt_sysroot:-no}" >&6; }
17911+ 17946
17912+ 17947
17913+ 17948
17914+
17915+
17916 # Check whether --enable-libtool-lock was given.
17917 if test "${enable_libtool_lock+set}" = set; then :
17918 enableval=$enable_libtool_lock;
17919@@ -7075,6 +7455,123 @@ esac 17949@@ -7075,6 +7455,123 @@ esac
17920 17950
17921 need_locks="$enable_libtool_lock" 17951 need_locks="$enable_libtool_lock"
@@ -18622,7 +18652,7 @@ index 0b352a454d..7eaea7db73 100755
18622 fi 18652 fi
18623 18653
18624 case "${host}" in 18654 case "${host}" in
18625@@ -13518,13 +14173,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 18655@@ -13520,13 +14175,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18626 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 18656 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18627 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 18657 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18628 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 18658 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -18643,7 +18673,7 @@ index 0b352a454d..7eaea7db73 100755
18643 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 18673 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18644 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 18674 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18645 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 18675 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18646@@ -13539,14 +14201,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 18676@@ -13541,14 +14203,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18647 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 18677 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18648 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 18678 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18649 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"`' 18679 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"`'
@@ -18662,7 +18692,7 @@ index 0b352a454d..7eaea7db73 100755
18662 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 18692 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18663 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 18693 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18664 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 18694 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18665@@ -13579,12 +14244,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 18695@@ -13581,12 +14246,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18666 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 18696 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18667 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 18697 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18668 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 18698 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -18676,7 +18706,7 @@ index 0b352a454d..7eaea7db73 100755
18676 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 18706 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18677 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 18707 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18678 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 18708 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18679@@ -13639,8 +14304,13 @@ reload_flag \ 18709@@ -13641,8 +14306,13 @@ reload_flag \
18680 OBJDUMP \ 18710 OBJDUMP \
18681 deplibs_check_method \ 18711 deplibs_check_method \
18682 file_magic_cmd \ 18712 file_magic_cmd \
@@ -18690,7 +18720,7 @@ index 0b352a454d..7eaea7db73 100755
18690 STRIP \ 18720 STRIP \
18691 RANLIB \ 18721 RANLIB \
18692 CC \ 18722 CC \
18693@@ -13650,12 +14320,14 @@ lt_cv_sys_global_symbol_pipe \ 18723@@ -13652,12 +14322,14 @@ lt_cv_sys_global_symbol_pipe \
18694 lt_cv_sys_global_symbol_to_cdecl \ 18724 lt_cv_sys_global_symbol_to_cdecl \
18695 lt_cv_sys_global_symbol_to_c_name_address \ 18725 lt_cv_sys_global_symbol_to_c_name_address \
18696 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 18726 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -18706,7 +18736,7 @@ index 0b352a454d..7eaea7db73 100755
18706 DSYMUTIL \ 18736 DSYMUTIL \
18707 NMEDIT \ 18737 NMEDIT \
18708 LIPO \ 18738 LIPO \
18709@@ -13671,7 +14343,6 @@ no_undefined_flag \ 18739@@ -13673,7 +14345,6 @@ no_undefined_flag \
18710 hardcode_libdir_flag_spec \ 18740 hardcode_libdir_flag_spec \
18711 hardcode_libdir_flag_spec_ld \ 18741 hardcode_libdir_flag_spec_ld \
18712 hardcode_libdir_separator \ 18742 hardcode_libdir_separator \
@@ -18714,7 +18744,7 @@ index 0b352a454d..7eaea7db73 100755
18714 exclude_expsyms \ 18744 exclude_expsyms \
18715 include_expsyms \ 18745 include_expsyms \
18716 file_list_spec \ 18746 file_list_spec \
18717@@ -13707,6 +14378,7 @@ module_cmds \ 18747@@ -13709,6 +14380,7 @@ module_cmds \
18718 module_expsym_cmds \ 18748 module_expsym_cmds \
18719 export_symbols_cmds \ 18749 export_symbols_cmds \
18720 prelink_cmds \ 18750 prelink_cmds \
@@ -18722,7 +18752,7 @@ index 0b352a454d..7eaea7db73 100755
18722 postinstall_cmds \ 18752 postinstall_cmds \
18723 postuninstall_cmds \ 18753 postuninstall_cmds \
18724 finish_cmds \ 18754 finish_cmds \
18725@@ -14463,7 +15135,8 @@ $as_echo X"$file" | 18755@@ -14465,7 +15137,8 @@ $as_echo X"$file" |
18726 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 18756 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18727 # 18757 #
18728 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 18758 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -18732,7 +18762,7 @@ index 0b352a454d..7eaea7db73 100755
18732 # Written by Gordon Matzigkeit, 1996 18762 # Written by Gordon Matzigkeit, 1996
18733 # 18763 #
18734 # This file is part of GNU Libtool. 18764 # This file is part of GNU Libtool.
18735@@ -14566,19 +15239,42 @@ SP2NL=$lt_lt_SP2NL 18765@@ -14568,19 +15241,42 @@ SP2NL=$lt_lt_SP2NL
18736 # turn newlines into spaces. 18766 # turn newlines into spaces.
18737 NL2SP=$lt_lt_NL2SP 18767 NL2SP=$lt_lt_NL2SP
18738 18768
@@ -18776,7 +18806,7 @@ index 0b352a454d..7eaea7db73 100755
18776 # A symbol stripping program. 18806 # A symbol stripping program.
18777 STRIP=$lt_STRIP 18807 STRIP=$lt_STRIP
18778 18808
18779@@ -14608,6 +15304,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 18809@@ -14610,6 +15306,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18780 # Transform the output of nm in a C name address pair when lib prefix is needed. 18810 # Transform the output of nm in a C name address pair when lib prefix is needed.
18781 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 18811 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18782 18812
@@ -18789,7 +18819,7 @@ index 0b352a454d..7eaea7db73 100755
18789 # The name of the directory that contains temporary libtool files. 18819 # The name of the directory that contains temporary libtool files.
18790 objdir=$objdir 18820 objdir=$objdir
18791 18821
18792@@ -14617,6 +15319,9 @@ MAGIC_CMD=$MAGIC_CMD 18822@@ -14619,6 +15321,9 @@ MAGIC_CMD=$MAGIC_CMD
18793 # Must we lock files when doing compilation? 18823 # Must we lock files when doing compilation?
18794 need_locks=$lt_need_locks 18824 need_locks=$lt_need_locks
18795 18825
@@ -18799,7 +18829,7 @@ index 0b352a454d..7eaea7db73 100755
18799 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 18829 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18800 DSYMUTIL=$lt_DSYMUTIL 18830 DSYMUTIL=$lt_DSYMUTIL
18801 18831
18802@@ -14731,12 +15436,12 @@ with_gcc=$GCC 18832@@ -14733,12 +15438,12 @@ with_gcc=$GCC
18803 # Compiler flag to turn off builtin functions. 18833 # Compiler flag to turn off builtin functions.
18804 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 18834 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18805 18835
@@ -18815,7 +18845,7 @@ index 0b352a454d..7eaea7db73 100755
18815 # Compiler flag to prevent dynamic linking. 18845 # Compiler flag to prevent dynamic linking.
18816 link_static_flag=$lt_lt_prog_compiler_static 18846 link_static_flag=$lt_lt_prog_compiler_static
18817 18847
18818@@ -14823,9 +15528,6 @@ inherit_rpath=$inherit_rpath 18848@@ -14825,9 +15530,6 @@ inherit_rpath=$inherit_rpath
18819 # Whether libtool must link a program against all its dependency libraries. 18849 # Whether libtool must link a program against all its dependency libraries.
18820 link_all_deplibs=$link_all_deplibs 18850 link_all_deplibs=$link_all_deplibs
18821 18851
@@ -18825,7 +18855,7 @@ index 0b352a454d..7eaea7db73 100755
18825 # Set to "yes" if exported symbols are required. 18855 # Set to "yes" if exported symbols are required.
18826 always_export_symbols=$always_export_symbols 18856 always_export_symbols=$always_export_symbols
18827 18857
18828@@ -14841,6 +15543,9 @@ include_expsyms=$lt_include_expsyms 18858@@ -14843,6 +15545,9 @@ include_expsyms=$lt_include_expsyms
18829 # Commands necessary for linking programs (against libraries) with templates. 18859 # Commands necessary for linking programs (against libraries) with templates.
18830 prelink_cmds=$lt_prelink_cmds 18860 prelink_cmds=$lt_prelink_cmds
18831 18861
@@ -18835,7 +18865,7 @@ index 0b352a454d..7eaea7db73 100755
18835 # Specify filename containing input files. 18865 # Specify filename containing input files.
18836 file_list_spec=$lt_file_list_spec 18866 file_list_spec=$lt_file_list_spec
18837 18867
18838@@ -14873,210 +15578,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 18868@@ -14875,210 +15580,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18839 # if finds mixed CR/LF and LF-only lines. Since sed operates in 18869 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18840 # text mode, it properly converts lines to CR/LF. This bash problem 18870 # text mode, it properly converts lines to CR/LF. This bash problem
18841 # is reportedly fixed, but why not run on old versions too? 18871 # is reportedly fixed, but why not run on old versions too?
@@ -19210,7 +19240,7 @@ index 0b352a454d..7eaea7db73 100755
19210 chmod +x "$ofile" 19240 chmod +x "$ofile"
19211 19241
19212diff --git a/opcodes/configure.ac b/opcodes/configure.ac 19242diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19213index b9f5eb8a4f..a31b66a2f0 100644 19243index a9fbfd61f1..c43780f64d 100644
19214--- a/opcodes/configure.ac 19244--- a/opcodes/configure.ac
19215+++ b/opcodes/configure.ac 19245+++ b/opcodes/configure.ac
19216@@ -167,7 +167,7 @@ changequote(,)dnl 19246@@ -167,7 +167,7 @@ changequote(,)dnl
@@ -19223,7 +19253,7 @@ index b9f5eb8a4f..a31b66a2f0 100644
19223 19253
19224 case "${host}" in 19254 case "${host}" in
19225diff --git a/zlib/configure b/zlib/configure 19255diff --git a/zlib/configure b/zlib/configure
19226index bed9e3ea2b..caef0b674e 100755 19256index dc2d9ed383..ed9a492f5c 100755
19227--- a/zlib/configure 19257--- a/zlib/configure
19228+++ b/zlib/configure 19258+++ b/zlib/configure
19229@@ -614,8 +614,11 @@ OTOOL 19259@@ -614,8 +614,11 @@ OTOOL
@@ -19411,7 +19441,7 @@ index bed9e3ea2b..caef0b674e 100755
19411 file_magic_cmd=$lt_cv_file_magic_cmd 19441 file_magic_cmd=$lt_cv_file_magic_cmd
19412 deplibs_check_method=$lt_cv_deplibs_check_method 19442 deplibs_check_method=$lt_cv_deplibs_check_method
19413 test -z "$deplibs_check_method" && deplibs_check_method=unknown 19443 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19414@@ -5170,9 +5271,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 19444@@ -5168,11 +5269,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19415 19445
19416 19446
19417 19447
@@ -19425,6 +19455,8 @@ index bed9e3ea2b..caef0b674e 100755
19425+ 19455+
19426+ 19456+
19427+ 19457+
19458
19459
19428 if test -n "$ac_tool_prefix"; then 19460 if test -n "$ac_tool_prefix"; then
19429- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 19461- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19430-set dummy ${ac_tool_prefix}ar; ac_word=$2 19462-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -19791,10 +19823,13 @@ index bed9e3ea2b..caef0b674e 100755
19791 19823
19792 19824
19793 19825
19794@@ -5793,6 +6138,41 @@ fi 19826@@ -5790,6 +6135,41 @@ fi
19795 19827
19796 19828
19797 19829
19830+
19831+
19832+
19798+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 19833+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19799+$as_echo_n "checking for sysroot... " >&6; } 19834+$as_echo_n "checking for sysroot... " >&6; }
19800+ 19835+
@@ -19827,12 +19862,9 @@ index bed9e3ea2b..caef0b674e 100755
19827+ 19862+
19828+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 19863+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19829+$as_echo "${lt_sysroot:-no}" >&6; } 19864+$as_echo "${lt_sysroot:-no}" >&6; }
19830+
19831+
19832+
19833 19865
19834 19866
19835 # Check whether --enable-libtool-lock was given. 19867
19836@@ -6004,6 +6384,123 @@ esac 19868@@ -6004,6 +6384,123 @@ esac
19837 19869
19838 need_locks="$enable_libtool_lock" 19870 need_locks="$enable_libtool_lock"
@@ -21121,5 +21153,5 @@ index bed9e3ea2b..caef0b674e 100755
21121 chmod +x "$ofile" 21153 chmod +x "$ofile"
21122 21154
21123-- 21155--
211242.12.0 211562.14.0
21125 21157
diff --git a/meta/recipes-devtools/binutils/binutils/0008-Add-the-armv5e-architecture-to-binutils.patch b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
index 449225a362..88019606f7 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-Add-the-armv5e-architecture-to-binutils.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
@@ -1,7 +1,7 @@
1From 9c313e8a15a7e7c5c0f2906e3218ed211563ac2a Mon Sep 17 00:00:00 2001 1From 2b87aad1741bc481dd0982f100ad5ea7f937bb61 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:37:10 +0000 3Date: Mon, 2 Mar 2015 01:37:10 +0000
4Subject: [PATCH 08/15] Add the armv5e architecture to binutils 4Subject: [PATCH 07/15] Add the armv5e architecture to binutils
5 5
6Binutils has a comment that indicates it is supposed to match gcc for 6Binutils has a comment that indicates it is supposed to match gcc for
7all of the support "-march=" settings, but it was lacking the armv5e setting. 7all of the support "-march=" settings, but it was lacking the armv5e setting.
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 1 file changed, 1 insertion(+) 19 1 file changed, 1 insertion(+)
20 20
21diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c 21diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
22index 60bda51070..eb6d0afd6e 100644 22index a885efe4fc..735eaa7447 100644
23--- a/gas/config/tc-arm.c 23--- a/gas/config/tc-arm.c
24+++ b/gas/config/tc-arm.c 24+++ b/gas/config/tc-arm.c
25@@ -25633,6 +25633,7 @@ static const struct arm_arch_option_table arm_archs[] = 25@@ -25990,6 +25990,7 @@ static const struct arm_arch_option_table arm_archs[] =
26 ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA), 26 ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA),
27 ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA), 27 ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA),
28 ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP), 28 ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP),
@@ -31,5 +31,5 @@ index 60bda51070..eb6d0afd6e 100644
31 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP), 31 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP),
32 ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP), 32 ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP),
33-- 33--
342.12.0 342.14.0
35 35
diff --git a/meta/recipes-devtools/binutils/binutils/0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index 1c40593927..30a22b504f 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -1,7 +1,7 @@
1From 2be9b44a4a308e3ea42a027c4c3211170f10c9c0 Mon Sep 17 00:00:00 2001 1From 331443a87a31ec504e5652fc099d9129a9a4deb8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:39:01 +0000 3Date: Mon, 2 Mar 2015 01:39:01 +0000
4Subject: [PATCH 09/15] don't let the distro compiler point to the wrong 4Subject: [PATCH 08/15] don't let the distro compiler point to the wrong
5 installation location 5 installation location
6 6
7Thanks to RP for helping find the source code causing the issue. 7Thanks to RP for helping find the source code causing the issue.
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 2 insertions(+), 1 deletion(-) 17 1 file changed, 2 insertions(+), 1 deletion(-)
18 18
19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in 19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
20index 0ff9e45e45..42c32642b2 100644 20index 25cfa29ad5..ce67a710e3 100644
21--- a/libiberty/Makefile.in 21--- a/libiberty/Makefile.in
22+++ b/libiberty/Makefile.in 22+++ b/libiberty/Makefile.in
23@@ -366,7 +366,8 @@ install-strip: install 23@@ -364,7 +364,8 @@ install-strip: install
24 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the 24 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
25 # default multilib, so we have to take CFLAGS into account as well, 25 # default multilib, so we have to take CFLAGS into account as well,
26 # since it will be passed the multilib flags. 26 # since it will be passed the multilib flags.
@@ -31,5 +31,5 @@ index 0ff9e45e45..42c32642b2 100644
31 if test -n "${target_header_dir}"; then \ 31 if test -n "${target_header_dir}"; then \
32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ 32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
33-- 33--
342.12.0 342.14.0
35 35
diff --git a/meta/recipes-devtools/binutils/binutils/0010-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
index 0774ad6f0c..e0e257880d 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,7 +1,7 @@
1From b1ab17abe4128684f19775448545176fb2a5e27e Mon Sep 17 00:00:00 2001 1From 0a4afdcf0700efd45963568e2d0049127cdf4434 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Jan 2016 06:31:09 +0000 3Date: Fri, 15 Jan 2016 06:31:09 +0000
4Subject: [PATCH 10/15] warn for uses of system directories when cross linking 4Subject: [PATCH 09/15] warn for uses of system directories when cross linking
5 5
62008-07-02 Joseph Myers <joseph@codesourcery.com> 62008-07-02 Joseph Myers <joseph@codesourcery.com>
7 7
@@ -45,12 +45,12 @@ Subject: [PATCH 10/15] warn for uses of system directories when cross linking
45 ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, 45 ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
46 /usr/lib, /usr/local/lib or /usr/X11R6/lib. 46 /usr/lib, /usr/local/lib or /usr/X11R6/lib.
47 47
48Upstream-Status: Pending
49
48Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 50Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
49Signed-off-by: Scott Garman <scott.a.garman@intel.com> 51Signed-off-by: Scott Garman <scott.a.garman@intel.com>
50Signed-off-by: Khem Raj <raj.khem@gmail.com> 52Signed-off-by: Khem Raj <raj.khem@gmail.com>
51--- 53---
52Upstream-Status: Pending
53
54 ld/config.in | 3 +++ 54 ld/config.in | 3 +++
55 ld/configure | 16 ++++++++++++++++ 55 ld/configure | 16 ++++++++++++++++
56 ld/configure.ac | 10 ++++++++++ 56 ld/configure.ac | 10 ++++++++++
@@ -63,10 +63,10 @@ Upstream-Status: Pending
63 9 files changed, 86 insertions(+) 63 9 files changed, 86 insertions(+)
64 64
65diff --git a/ld/config.in b/ld/config.in 65diff --git a/ld/config.in b/ld/config.in
66index 2c6d698b6c..d3cb7e882d 100644 66index a846743da6..df3cd5fb60 100644
67--- a/ld/config.in 67--- a/ld/config.in
68+++ b/ld/config.in 68+++ b/ld/config.in
69@@ -17,6 +17,9 @@ 69@@ -27,6 +27,9 @@
70 language is requested. */ 70 language is requested. */
71 #undef ENABLE_NLS 71 #undef ENABLE_NLS
72 72
@@ -77,10 +77,10 @@ index 2c6d698b6c..d3cb7e882d 100644
77 #undef EXTRA_SHLIB_EXTENSION 77 #undef EXTRA_SHLIB_EXTENSION
78 78
79diff --git a/ld/configure b/ld/configure 79diff --git a/ld/configure b/ld/configure
80index 4277b74bad..63109644b6 100755 80index 4e71511bd1..71c6ad1fd1 100755
81--- a/ld/configure 81--- a/ld/configure
82+++ b/ld/configure 82+++ b/ld/configure
83@@ -793,6 +793,7 @@ with_lib_path 83@@ -789,6 +789,7 @@ with_lib_path
84 enable_targets 84 enable_targets
85 enable_64_bit_bfd 85 enable_64_bit_bfd
86 with_sysroot 86 with_sysroot
@@ -88,7 +88,7 @@ index 4277b74bad..63109644b6 100755
88 enable_gold 88 enable_gold
89 enable_got 89 enable_got
90 enable_compressed_debug_sections 90 enable_compressed_debug_sections
91@@ -1450,6 +1451,8 @@ Optional Features: 91@@ -1448,6 +1449,8 @@ Optional Features:
92 --disable-largefile omit support for large files 92 --disable-largefile omit support for large files
93 --enable-targets alternative target configurations 93 --enable-targets alternative target configurations
94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) 94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
@@ -97,7 +97,7 @@ index 4277b74bad..63109644b6 100755
97 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 97 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
98 --enable-got=<type> GOT handling scheme (target, single, negative, 98 --enable-got=<type> GOT handling scheme (target, single, negative,
99 multigot) 99 multigot)
100@@ -16314,6 +16317,19 @@ fi 100@@ -16315,6 +16318,19 @@ fi
101 101
102 102
103 103
@@ -118,7 +118,7 @@ index 4277b74bad..63109644b6 100755
118 if test "${enable_gold+set}" = set; then : 118 if test "${enable_gold+set}" = set; then :
119 enableval=$enable_gold; case "${enableval}" in 119 enableval=$enable_gold; case "${enableval}" in
120diff --git a/ld/configure.ac b/ld/configure.ac 120diff --git a/ld/configure.ac b/ld/configure.ac
121index 36a9f5083a..47f1d33fa5 100644 121index 00080f85fd..3aa98e37fb 100644
122--- a/ld/configure.ac 122--- a/ld/configure.ac
123+++ b/ld/configure.ac 123+++ b/ld/configure.ac
124@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) 124@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
@@ -139,12 +139,12 @@ index 36a9f5083a..47f1d33fa5 100644
139 dnl "install_as_default" is set to false if gold is the default linker. 139 dnl "install_as_default" is set to false if gold is the default linker.
140 dnl "installed_linker" is the installed BFD linker name. 140 dnl "installed_linker" is the installed BFD linker name.
141diff --git a/ld/ld.h b/ld/ld.h 141diff --git a/ld/ld.h b/ld/ld.h
142index 104bb8e237..74c914bdd5 100644 142index c6fa1247f0..01c373498f 100644
143--- a/ld/ld.h 143--- a/ld/ld.h
144+++ b/ld/ld.h 144+++ b/ld/ld.h
145@@ -172,6 +172,14 @@ typedef struct 145@@ -174,6 +174,14 @@ typedef struct
146 /* If set, display the target memory usage (per memory region). */ 146 in the linker script. */
147 bfd_boolean print_memory_usage; 147 bfd_boolean force_group_allocation;
148 148
149+ /* If TRUE (the default) warn for uses of system directories when 149+ /* If TRUE (the default) warn for uses of system directories when
150+ cross linking. */ 150+ cross linking. */
@@ -158,10 +158,10 @@ index 104bb8e237..74c914bdd5 100644
158 enum endian_enum endian; 158 enum endian_enum endian;
159 159
160diff --git a/ld/ld.texinfo b/ld/ld.texinfo 160diff --git a/ld/ld.texinfo b/ld/ld.texinfo
161index d393acdd94..ba995b1e3a 100644 161index ebe7e7b7bd..33aa2c62fa 100644
162--- a/ld/ld.texinfo 162--- a/ld/ld.texinfo
163+++ b/ld/ld.texinfo 163+++ b/ld/ld.texinfo
164@@ -2403,6 +2403,18 @@ string identifying the original linked file does not change. 164@@ -2480,6 +2480,18 @@ string identifying the original linked file does not change.
165 165
166 Passing @code{none} for @var{style} disables the setting from any 166 Passing @code{none} for @var{style} disables the setting from any
167 @code{--build-id} options earlier on the command line. 167 @code{--build-id} options earlier on the command line.
@@ -181,11 +181,11 @@ index d393acdd94..ba995b1e3a 100644
181 181
182 @c man end 182 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c 183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index 0943bb2dfa..95874c75de 100644 184index 3b37a0a3e2..5c85b01849 100644
185--- a/ld/ldfile.c 185--- a/ld/ldfile.c
186+++ b/ld/ldfile.c 186+++ b/ld/ldfile.c
187@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) 187@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
188 new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); 188 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
189 else 189 else
190 new_dirs->name = xstrdup (name); 190 new_dirs->name = xstrdup (name);
191+ 191+
@@ -209,23 +209,23 @@ index 0943bb2dfa..95874c75de 100644
209 209
210 /* Try to open a BFD for a lang_input_statement. */ 210 /* Try to open a BFD for a lang_input_statement. */
211diff --git a/ld/ldlex.h b/ld/ldlex.h 211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index 3ecac2bc86..34117f43a5 100644 212index 5aa7f6bc3e..cb655e0399 100644
213--- a/ld/ldlex.h 213--- a/ld/ldlex.h
214+++ b/ld/ldlex.h 214+++ b/ld/ldlex.h
215@@ -146,6 +146,8 @@ enum option_values 215@@ -147,6 +147,8 @@ enum option_values
216 OPTION_PRINT_MEMORY_USAGE,
217 OPTION_REQUIRE_DEFINED_SYMBOL, 216 OPTION_REQUIRE_DEFINED_SYMBOL,
218 OPTION_ORPHAN_HANDLING, 217 OPTION_ORPHAN_HANDLING,
218 OPTION_FORCE_GROUP_ALLOCATION,
219+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, 219+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
220+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, 220+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
221 }; 221 };
222 222
223 /* The initial parser states. */ 223 /* The initial parser states. */
224diff --git a/ld/ldmain.c b/ld/ldmain.c 224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index 1e48b1a2db..21f27bacf1 100644 225index 2b09f20413..89e2a3a805 100644
226--- a/ld/ldmain.c 226--- a/ld/ldmain.c
227+++ b/ld/ldmain.c 227+++ b/ld/ldmain.c
228@@ -270,6 +270,8 @@ main (int argc, char **argv) 228@@ -261,6 +261,8 @@ main (int argc, char **argv)
229 command_line.warn_mismatch = TRUE; 229 command_line.warn_mismatch = TRUE;
230 command_line.warn_search_mismatch = TRUE; 230 command_line.warn_search_mismatch = TRUE;
231 command_line.check_section_addresses = -1; 231 command_line.check_section_addresses = -1;
@@ -235,10 +235,10 @@ index 1e48b1a2db..21f27bacf1 100644
235 /* We initialize DEMANGLING based on the environment variable 235 /* We initialize DEMANGLING based on the environment variable
236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the 236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
237diff --git a/ld/lexsup.c b/ld/lexsup.c 237diff --git a/ld/lexsup.c b/ld/lexsup.c
238index 0b7d4976ac..dedc07a143 100644 238index effa277b16..e4929607e9 100644
239--- a/ld/lexsup.c 239--- a/ld/lexsup.c
240+++ b/ld/lexsup.c 240+++ b/ld/lexsup.c
241@@ -535,6 +535,14 @@ static const struct ld_option ld_options[] = 241@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] =
242 { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, 242 { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
243 '\0', N_("=MODE"), N_("Control how orphan sections are handled."), 243 '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
244 TWO_DASHES }, 244 TWO_DASHES },
@@ -253,7 +253,7 @@ index 0b7d4976ac..dedc07a143 100644
253 }; 253 };
254 254
255 #define OPTION_COUNT ARRAY_SIZE (ld_options) 255 #define OPTION_COUNT ARRAY_SIZE (ld_options)
256@@ -1562,6 +1570,14 @@ parse_args (unsigned argc, char **argv) 256@@ -1568,6 +1576,14 @@ parse_args (unsigned argc, char **argv)
257 einfo (_("%P%F: invalid argument to option" 257 einfo (_("%P%F: invalid argument to option"
258 " \"--orphan-handling\"\n")); 258 " \"--orphan-handling\"\n"));
259 break; 259 break;
@@ -269,5 +269,5 @@ index 0b7d4976ac..dedc07a143 100644
269 } 269 }
270 270
271-- 271--
2722.12.0 2722.14.0
273 273
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index 949ef51bdf..496242efa4 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,7 +1,7 @@
1From 4fe13a36997253a5c91bcb086aeb392ab2095f67 Mon Sep 17 00:00:00 2001 1From 88fac08f1c472c612f381cbb9408756f2f58b4ff Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:42:38 +0000 3Date: Mon, 2 Mar 2015 01:42:38 +0000
4Subject: [PATCH 11/15] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH 10/15] Fix rpath in libtool when sysroot is enabled
5 5
6Enabling sysroot support in libtool exposed a bug where the final 6Enabling sysroot support in libtool exposed a bug where the final
7library had an RPATH encoded into it which still pointed to the 7library had an RPATH encoded into it which still pointed to the
@@ -48,5 +48,5 @@ index 70e856e065..11ee684ccc 100644
48 if test -z "$hardcode_libdirs"; then 48 if test -z "$hardcode_libdirs"; then
49 hardcode_libdirs="$libdir" 49 hardcode_libdirs="$libdir"
50-- 50--
512.12.0 512.14.0
52 52
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
index 2ac101c958..ac87a2d1de 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Change-default-emulation-for-mips64-linux.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
@@ -1,7 +1,7 @@
1From f43f832e0009caea6a3d5bcaa8f0a64d943072ea Mon Sep 17 00:00:00 2001 1From 497660bdbeb6788786553a5d733105f7f898dc62 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:44:14 +0000 3Date: Mon, 2 Mar 2015 01:44:14 +0000
4Subject: [PATCH 12/15] Change default emulation for mips64*-*-linux 4Subject: [PATCH 11/15] Change default emulation for mips64*-*-linux
5 5
6we change the default emulations to be N64 instead of N32 6we change the default emulations to be N64 instead of N32
7 7
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 8 insertions(+), 8 deletions(-) 14 2 files changed, 8 insertions(+), 8 deletions(-)
15 15
16diff --git a/bfd/config.bfd b/bfd/config.bfd 16diff --git a/bfd/config.bfd b/bfd/config.bfd
17index 1b28016b91..63596c2ebc 100644 17index dc24aabad5..4511024f22 100644
18--- a/bfd/config.bfd 18--- a/bfd/config.bfd
19+++ b/bfd/config.bfd 19+++ b/bfd/config.bfd
20@@ -1183,12 +1183,12 @@ case "${targ}" in 20@@ -1186,12 +1186,12 @@ case "${targ}" in
21 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" 21 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
22 ;; 22 ;;
23 mips64*el-*-linux*) 23 mips64*el-*-linux*)
@@ -35,10 +35,10 @@ index 1b28016b91..63596c2ebc 100644
35 mips*el-*-linux*) 35 mips*el-*-linux*)
36 targ_defvec=mips_elf32_trad_le_vec 36 targ_defvec=mips_elf32_trad_le_vec
37diff --git a/ld/configure.tgt b/ld/configure.tgt 37diff --git a/ld/configure.tgt b/ld/configure.tgt
38index b85c6bb35a..4e77383a19 100644 38index 47c719cd05..fe7b9238b2 100644
39--- a/ld/configure.tgt 39--- a/ld/configure.tgt
40+++ b/ld/configure.tgt 40+++ b/ld/configure.tgt
41@@ -518,11 +518,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks 41@@ -530,11 +530,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks
42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks 42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
43 targ_extra_emuls="elf32elmipvxworks" ;; 43 targ_extra_emuls="elf32elmipvxworks" ;;
44 mips*-*-windiss) targ_emul=elf32mipswindiss ;; 44 mips*-*-windiss) targ_emul=elf32mipswindiss ;;
@@ -55,5 +55,5 @@ index b85c6bb35a..4e77383a19 100644
55 mips*el-*-linux-*) targ_emul=elf32ltsmip 55 mips*el-*-linux-*) targ_emul=elf32ltsmip
56 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" 56 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
57-- 57--
582.12.0 582.14.0
59 59
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
index b03e04608d..dc5e580739 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-Add-support-for-Netlogic-XLP.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
@@ -1,7 +1,7 @@
1From fc6fa6a6e6e9e6e5ad7080785af31b4ea68f60c4 Mon Sep 17 00:00:00 2001 1From 8c60a55d3678589d93739bd27fec216911d80968 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:06:19 +0000 3Date: Sun, 14 Feb 2016 17:06:19 +0000
4Subject: [PATCH 13/15] Add support for Netlogic XLP 4Subject: [PATCH 12/15] Add support for Netlogic XLP
5 5
6Patch From: Nebu Philips <nphilips@netlogicmicro.com> 6Patch From: Nebu Philips <nphilips@netlogicmicro.com>
7 7
@@ -11,12 +11,12 @@ Netlogic. Also, update vendor name to NLM wherever applicable.
11Use 0x00000080 for INSN_XLP, the value 0x00000040 has already been 11Use 0x00000080 for INSN_XLP, the value 0x00000040 has already been
12assigned to INSN_OCTEON3 12assigned to INSN_OCTEON3
13 13
14Upstream-Status: Pending
15
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 16Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Baoshan Pang <baoshan.pang@windriver.com> 17Signed-off-by: Baoshan Pang <baoshan.pang@windriver.com>
16Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 18Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
17--- 19---
18Upstream-Status: Pending
19
20 bfd/aoutx.h | 1 + 20 bfd/aoutx.h | 1 +
21 bfd/archures.c | 1 + 21 bfd/archures.c | 1 +
22 bfd/bfd-in2.h | 1 + 22 bfd/bfd-in2.h | 1 +
@@ -27,17 +27,17 @@ Upstream-Status: Pending
27 gas/config/tc-mips.c | 4 +++- 27 gas/config/tc-mips.c | 4 +++-
28 gas/configure | 3 +++ 28 gas/configure | 3 +++
29 include/elf/mips.h | 1 + 29 include/elf/mips.h | 1 +
30 include/opcode/mips.h | 10 ++++++++-- 30 include/opcode/mips.h | 6 ++++++
31 ld/configure.tgt | 2 ++ 31 ld/configure.tgt | 2 ++
32 opcodes/mips-dis.c | 12 +++++------- 32 opcodes/mips-dis.c | 12 +++++-------
33 opcodes/mips-opc.c | 33 +++++++++++++++++++++------------ 33 opcodes/mips-opc.c | 31 ++++++++++++++++++++-----------
34 14 files changed, 64 insertions(+), 24 deletions(-) 34 14 files changed, 61 insertions(+), 21 deletions(-)
35 35
36diff --git a/bfd/aoutx.h b/bfd/aoutx.h 36diff --git a/bfd/aoutx.h b/bfd/aoutx.h
37index d30e8b8fbc..913b499744 100644 37index 3d38fda14b..0aec49bbb3 100644
38--- a/bfd/aoutx.h 38--- a/bfd/aoutx.h
39+++ b/bfd/aoutx.h 39+++ b/bfd/aoutx.h
40@@ -812,6 +812,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, 40@@ -814,6 +814,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
41 case bfd_mach_mipsisa64r6: 41 case bfd_mach_mipsisa64r6:
42 case bfd_mach_mips_sb1: 42 case bfd_mach_mips_sb1:
43 case bfd_mach_mips_xlr: 43 case bfd_mach_mips_xlr:
@@ -46,34 +46,34 @@ index d30e8b8fbc..913b499744 100644
46 arch_flags = M_MIPS2; 46 arch_flags = M_MIPS2;
47 break; 47 break;
48diff --git a/bfd/archures.c b/bfd/archures.c 48diff --git a/bfd/archures.c b/bfd/archures.c
49index 6f35a5b2a7..d12cdf609a 100644 49index 433b95fa08..063b7943a1 100644
50--- a/bfd/archures.c 50--- a/bfd/archures.c
51+++ b/bfd/archures.c 51+++ b/bfd/archures.c
52@@ -197,6 +197,7 @@ DESCRIPTION 52@@ -201,6 +201,7 @@ DESCRIPTION
53 .#define bfd_mach_mips_octeon2 6502
54 .#define bfd_mach_mips_octeon3 6503 53 .#define bfd_mach_mips_octeon3 6503
55 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *} 54 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *}
55 .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2' *}
56+.#define bfd_mach_mips_xlp 887680 {* decimal 'XLP' *} 56+.#define bfd_mach_mips_xlp 887680 {* decimal 'XLP' *}
57 .#define bfd_mach_mipsisa32 32 57 .#define bfd_mach_mipsisa32 32
58 .#define bfd_mach_mipsisa32r2 33 58 .#define bfd_mach_mipsisa32r2 33
59 .#define bfd_mach_mipsisa32r3 34 59 .#define bfd_mach_mipsisa32r3 34
60diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h 60diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
61index 6288c3bb4a..e9f9859a7b 100644 61index d126aed086..2b753b3a93 100644
62--- a/bfd/bfd-in2.h 62--- a/bfd/bfd-in2.h
63+++ b/bfd/bfd-in2.h 63+++ b/bfd/bfd-in2.h
64@@ -2041,6 +2041,7 @@ enum bfd_architecture 64@@ -2060,6 +2060,7 @@ enum bfd_architecture
65 #define bfd_mach_mips_octeon2 6502
66 #define bfd_mach_mips_octeon3 6503 65 #define bfd_mach_mips_octeon3 6503
67 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */ 66 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */
67 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2' */
68+#define bfd_mach_mips_xlp 887680 /* decimal 'XLP' */ 68+#define bfd_mach_mips_xlp 887680 /* decimal 'XLP' */
69 #define bfd_mach_mipsisa32 32 69 #define bfd_mach_mipsisa32 32
70 #define bfd_mach_mipsisa32r2 33 70 #define bfd_mach_mipsisa32r2 33
71 #define bfd_mach_mipsisa32r3 34 71 #define bfd_mach_mipsisa32r3 34
72diff --git a/bfd/config.bfd b/bfd/config.bfd 72diff --git a/bfd/config.bfd b/bfd/config.bfd
73index 63596c2ebc..6e923fb0ed 100644 73index 4511024f22..f0f9072f10 100644
74--- a/bfd/config.bfd 74--- a/bfd/config.bfd
75+++ b/bfd/config.bfd 75+++ b/bfd/config.bfd
76@@ -1166,6 +1166,11 @@ case "${targ}" in 76@@ -1169,6 +1169,11 @@ case "${targ}" in
77 targ_defvec=mips_elf32_le_vec 77 targ_defvec=mips_elf32_le_vec
78 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" 78 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
79 ;; 79 ;;
@@ -86,23 +86,23 @@ index 63596c2ebc..6e923fb0ed 100644
86 targ_defvec=mips_elf32_be_vec 86 targ_defvec=mips_elf32_be_vec
87 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" 87 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
88diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c 88diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
89index b9ecdd6e55..df1bffc25b 100644 89index 2493094bef..8375d1ae96 100644
90--- a/bfd/cpu-mips.c 90--- a/bfd/cpu-mips.c
91+++ b/bfd/cpu-mips.c 91+++ b/bfd/cpu-mips.c
92@@ -104,7 +104,8 @@ enum 92@@ -105,7 +105,8 @@ enum
93 I_mipsocteon2,
94 I_mipsocteon3, 93 I_mipsocteon3,
95 I_xlr, 94 I_xlr,
95 I_interaptiv_mr2,
96- I_micromips 96- I_micromips
97+ I_micromips, 97+ I_micromips,
98+ I_xlp 98+ I_xlp
99 }; 99 };
100 100
101 #define NN(index) (&arch_info_struct[(index) + 1]) 101 #define NN(index) (&arch_info_struct[(index) + 1])
102@@ -155,7 +156,8 @@ static const bfd_arch_info_type arch_info_struct[] = 102@@ -158,7 +159,8 @@ static const bfd_arch_info_type arch_info_struct[] =
103 N (64, 64, bfd_mach_mips_octeon2,"mips:octeon2", FALSE, NN(I_mipsocteon2)),
104 N (64, 64, bfd_mach_mips_octeon3, "mips:octeon3", FALSE, NN(I_mipsocteon3)),
105 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), 103 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)),
104 N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE,
105 NN(I_interaptiv_mr2)),
106- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) 106- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0)
107+ N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,NN(I_micromips)), 107+ N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,NN(I_micromips)),
108+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, 0) 108+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, 0)
@@ -110,20 +110,20 @@ index b9ecdd6e55..df1bffc25b 100644
110 110
111 /* The default architecture is mips:3000, but with a machine number of 111 /* The default architecture is mips:3000, but with a machine number of
112diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c 112diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
113index 723853f821..7b464211c3 100644 113index fddf68c816..354c85d00b 100644
114--- a/bfd/elfxx-mips.c 114--- a/bfd/elfxx-mips.c
115+++ b/bfd/elfxx-mips.c 115+++ b/bfd/elfxx-mips.c
116@@ -6787,6 +6787,9 @@ _bfd_elf_mips_mach (flagword flags) 116@@ -6796,6 +6796,9 @@ _bfd_elf_mips_mach (flagword flags)
117 case E_MIPS_MACH_XLR: 117 case E_MIPS_MACH_IAMR2:
118 return bfd_mach_mips_xlr; 118 return bfd_mach_mips_interaptiv_mr2;
119 119
120+ case E_MIPS_MACH_XLP: 120+ case E_MIPS_MACH_XLP:
121+ return bfd_mach_mips_xlp; 121+ return bfd_mach_mips_xlp;
122+ 122+
123 default: 123 default:
124 switch (flags & EF_MIPS_ARCH) 124 switch (flags & EF_MIPS_ARCH)
125 { 125 {
126@@ -12106,6 +12109,10 @@ mips_set_isa_flags (bfd *abfd) 126@@ -11956,6 +11959,10 @@ mips_set_isa_flags (bfd *abfd)
127 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; 127 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2;
128 break; 128 break;
129 129
@@ -134,7 +134,7 @@ index 723853f821..7b464211c3 100644
134 case bfd_mach_mipsisa32: 134 case bfd_mach_mipsisa32:
135 val = E_MIPS_ARCH_32; 135 val = E_MIPS_ARCH_32;
136 break; 136 break;
137@@ -14135,6 +14142,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = 137@@ -13989,6 +13996,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
138 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon }, 138 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
139 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 }, 139 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
140 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 }, 140 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 },
@@ -143,19 +143,19 @@ index 723853f821..7b464211c3 100644
143 /* MIPS64 extensions. */ 143 /* MIPS64 extensions. */
144 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, 144 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },
145diff --git a/binutils/readelf.c b/binutils/readelf.c 145diff --git a/binutils/readelf.c b/binutils/readelf.c
146index 8dca490226..b5f577f5a1 100644 146index 2b15f0f2cb..092744708e 100644
147--- a/binutils/readelf.c 147--- a/binutils/readelf.c
148+++ b/binutils/readelf.c 148+++ b/binutils/readelf.c
149@@ -3261,6 +3261,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) 149@@ -3335,6 +3335,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
150 case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break;
151 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; 150 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break;
152 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; 151 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break;
153+ case E_MIPS_MACH_XLP: strcat (buf, ", xlp"); break; 152 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break;
153+ case E_MIPS_MACH_XLP: strcat (buf, ", xlp"); break;
154 case 0: 154 case 0:
155 /* We simply ignore the field in this case to avoid confusion: 155 /* We simply ignore the field in this case to avoid confusion:
156 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU 156 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU
157diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c 157diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
158index e24e84df54..baf84e419d 100644 158index 3804df2958..9576c986db 100644
159--- a/gas/config/tc-mips.c 159--- a/gas/config/tc-mips.c
160+++ b/gas/config/tc-mips.c 160+++ b/gas/config/tc-mips.c
161@@ -552,6 +552,7 @@ static int mips_32bitmode = 0; 161@@ -552,6 +552,7 @@ static int mips_32bitmode = 0;
@@ -174,7 +174,7 @@ index e24e84df54..baf84e419d 100644
174 ) 174 )
175 175
176 /* Whether the processor uses hardware interlocks to protect reads 176 /* Whether the processor uses hardware interlocks to protect reads
177@@ -19409,7 +19411,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = 177@@ -19738,7 +19740,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
178 /* Broadcom XLP. 178 /* Broadcom XLP.
179 XLP is mostly like XLR, with the prominent exception that it is 179 XLP is mostly like XLR, with the prominent exception that it is
180 MIPS64R2 rather than MIPS64. */ 180 MIPS64R2 rather than MIPS64. */
@@ -184,7 +184,7 @@ index e24e84df54..baf84e419d 100644
184 /* MIPS 64 Release 6 */ 184 /* MIPS 64 Release 6 */
185 { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, 185 { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6},
186diff --git a/gas/configure b/gas/configure 186diff --git a/gas/configure b/gas/configure
187index a36f1ae161..99f0a94e20 100755 187index 81dd4cbd97..95bdf3b19b 100755
188--- a/gas/configure 188--- a/gas/configure
189+++ b/gas/configure 189+++ b/gas/configure
190@@ -12989,6 +12989,9 @@ _ACEOF 190@@ -12989,6 +12989,9 @@ _ACEOF
@@ -198,7 +198,7 @@ index a36f1ae161..99f0a94e20 100755
198 mips_cpu=r3900 198 mips_cpu=r3900
199 ;; 199 ;;
200diff --git a/include/elf/mips.h b/include/elf/mips.h 200diff --git a/include/elf/mips.h b/include/elf/mips.h
201index 3e27b05122..81ea78a817 100644 201index a4bea43ff8..73d904e25f 100644
202--- a/include/elf/mips.h 202--- a/include/elf/mips.h
203+++ b/include/elf/mips.h 203+++ b/include/elf/mips.h
204@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) 204@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
@@ -210,31 +210,27 @@ index 3e27b05122..81ea78a817 100644
210 #define E_MIPS_MACH_OCTEON3 0x008e0000 210 #define E_MIPS_MACH_OCTEON3 0x008e0000
211 #define E_MIPS_MACH_5400 0x00910000 211 #define E_MIPS_MACH_5400 0x00910000
212diff --git a/include/opcode/mips.h b/include/opcode/mips.h 212diff --git a/include/opcode/mips.h b/include/opcode/mips.h
213index 0d043d9520..450e9c2d67 100644 213index ceae9ec50a..276ee3c6c1 100644
214--- a/include/opcode/mips.h 214--- a/include/opcode/mips.h
215+++ b/include/opcode/mips.h 215+++ b/include/opcode/mips.h
216@@ -1244,8 +1244,10 @@ static const unsigned int mips_isa_table[] = { 216@@ -1259,6 +1259,8 @@ static const unsigned int mips_isa_table[] = {
217 #define INSN_LOONGSON_2F 0x80000000 217 #define INSN_XLR 0x00000020
218 /* Loongson 3A. */ 218 /* Imagination interAptiv MR2. */
219 #define INSN_LOONGSON_3A 0x00000400 219 #define INSN_INTERAPTIV_MR2 0x04000000
220-/* RMI Xlr instruction */
221-#define INSN_XLR 0x00000020
222+/* Netlogic Xlr instruction */
223+#define INSN_XLR 0x00000020
224+/* Netlogic XlP instruction */ 220+/* Netlogic XlP instruction */
225+#define INSN_XLP 0x00000080 221+#define INSN_XLP 0x00000080
226 222
227 /* DSP ASE */ 223 /* DSP ASE */
228 #define ASE_DSP 0x00000001 224 #define ASE_DSP 0x00000001
229@@ -1344,6 +1346,7 @@ static const unsigned int mips_isa_table[] = { 225@@ -1365,6 +1367,7 @@ static const unsigned int mips_isa_table[] = {
230 #define CPU_OCTEON2 6502
231 #define CPU_OCTEON3 6503 226 #define CPU_OCTEON3 6503
232 #define CPU_XLR 887682 /* decimal 'XLR' */ 227 #define CPU_XLR 887682 /* decimal 'XLR' */
228 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */
233+#define CPU_XLP 887680 /* decimal 'XLP' */ 229+#define CPU_XLP 887680 /* decimal 'XLP' */
234 230
235 /* Return true if the given CPU is included in INSN_* mask MASK. */ 231 /* Return true if the given CPU is included in INSN_* mask MASK. */
236 232
237@@ -1421,6 +1424,9 @@ cpu_is_member (int cpu, unsigned int mask) 233@@ -1445,6 +1448,9 @@ cpu_is_member (int cpu, unsigned int mask)
238 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) 234 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6)
239 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); 235 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6);
240 236
@@ -245,10 +241,10 @@ index 0d043d9520..450e9c2d67 100644
245 return FALSE; 241 return FALSE;
246 } 242 }
247diff --git a/ld/configure.tgt b/ld/configure.tgt 243diff --git a/ld/configure.tgt b/ld/configure.tgt
248index 4e77383a19..8a81f7ac39 100644 244index fe7b9238b2..2adf108b17 100644
249--- a/ld/configure.tgt 245--- a/ld/configure.tgt
250+++ b/ld/configure.tgt 246+++ b/ld/configure.tgt
251@@ -504,6 +504,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*) 247@@ -516,6 +516,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*)
252 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) 248 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
253 targ_emul=elf32btsmip 249 targ_emul=elf32btsmip
254 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; 250 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;;
@@ -258,10 +254,10 @@ index 4e77383a19..8a81f7ac39 100644
258 targ_extra_emuls="elf32lr5900" 254 targ_extra_emuls="elf32lr5900"
259 targ_extra_libpath=$targ_extra_emuls ;; 255 targ_extra_libpath=$targ_extra_emuls ;;
260diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c 256diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
261index bb9912e462..70ecc51717 100644 257index 45195007c1..4a80a05d19 100644
262--- a/opcodes/mips-dis.c 258--- a/opcodes/mips-dis.c
263+++ b/opcodes/mips-dis.c 259+++ b/opcodes/mips-dis.c
264@@ -648,13 +648,11 @@ const struct mips_arch_choice mips_arch_choices[] = 260@@ -655,13 +655,11 @@ const struct mips_arch_choice mips_arch_choices[] =
265 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), 261 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
266 mips_cp1_names_mips3264, mips_hwr_names_numeric }, 262 mips_cp1_names_mips3264, mips_hwr_names_numeric },
267 263
@@ -281,20 +277,18 @@ index bb9912e462..70ecc51717 100644
281 /* This entry, mips16, is here only for ISA/processor selection; do 277 /* This entry, mips16, is here only for ISA/processor selection; do
282 not print its name. */ 278 not print its name. */
283diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c 279diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
284index 5cb8e7365f..f2074856a2 100644 280index 19fca408c9..d02069c528 100644
285--- a/opcodes/mips-opc.c 281--- a/opcodes/mips-opc.c
286+++ b/opcodes/mips-opc.c 282+++ b/opcodes/mips-opc.c
287@@ -320,7 +320,8 @@ decode_mips_operand (const char *p) 283@@ -328,6 +328,7 @@ decode_mips_operand (const char *p)
288 #define IOCTP (INSN_OCTEONP | INSN_OCTEON2 | INSN_OCTEON3)
289 #define IOCT2 (INSN_OCTEON2 | INSN_OCTEON3)
290 #define IOCT3 INSN_OCTEON3 284 #define IOCT3 INSN_OCTEON3
291-#define XLR INSN_XLR 285 #define XLR INSN_XLR
292+#define XLR INSN_XLR 286 #define IAMR2 INSN_INTERAPTIV_MR2
293+#define XLP INSN_XLP 287+#define XLP INSN_XLP
294 #define IVIRT ASE_VIRT 288 #define IVIRT ASE_VIRT
295 #define IVIRT64 ASE_VIRT64 289 #define IVIRT64 ASE_VIRT64
296 290
297@@ -958,6 +959,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 291@@ -966,6 +967,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
298 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 292 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
299 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, 293 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 },
300 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 294 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
@@ -302,7 +296,7 @@ index 5cb8e7365f..f2074856a2 100644
302 /* ctc0 is at the bottom of the table. */ 296 /* ctc0 is at the bottom of the table. */
303 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 297 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
304 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 298 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
305@@ -990,12 +992,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 299@@ -998,12 +1000,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
306 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, 300 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 },
307 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, 301 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 },
308 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, 302 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 },
@@ -317,7 +311,7 @@ index 5cb8e7365f..f2074856a2 100644
317 /* dctr and dctw are used on the r5000. */ 311 /* dctr and dctw are used on the r5000. */
318 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 312 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
319 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 313 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
320@@ -1067,6 +1070,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 314@@ -1075,6 +1078,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
321 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, 315 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 },
322 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 316 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
323 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 317 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
@@ -325,7 +319,7 @@ index 5cb8e7365f..f2074856a2 100644
325 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, 319 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
326 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, 320 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
327 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, 321 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },
328@@ -1082,6 +1086,8 @@ const struct mips_opcode mips_builtin_opcodes[] = 322@@ -1090,6 +1094,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
329 /* dmfc3 is at the bottom of the table. */ 323 /* dmfc3 is at the bottom of the table. */
330 /* dmtc3 is at the bottom of the table. */ 324 /* dmtc3 is at the bottom of the table. */
331 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 325 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
@@ -334,7 +328,7 @@ index 5cb8e7365f..f2074856a2 100644
334 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 328 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
335 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, 329 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
336 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, 330 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },
337@@ -1235,9 +1241,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 331@@ -1243,9 +1249,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
338 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, 332 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
339 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, 333 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
340 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, 334 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 },
@@ -347,7 +341,7 @@ index 5cb8e7365f..f2074856a2 100644
347 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 341 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
348 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 342 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
349 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, 343 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF },
350@@ -1402,7 +1408,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 344@@ -1410,7 +1416,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
351 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, 345 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 },
352 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, 346 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 },
353 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, 347 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -356,7 +350,7 @@ index 5cb8e7365f..f2074856a2 100644
356 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, 350 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 },
357 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, 351 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 },
358 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, 352 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 },
359@@ -1447,10 +1453,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 353@@ -1455,10 +1461,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
360 /* move is at the top of the table. */ 354 /* move is at the top of the table. */
361 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, 355 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 },
362 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, 356 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 },
@@ -372,7 +366,7 @@ index 5cb8e7365f..f2074856a2 100644
372 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, 366 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 },
373 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, 367 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 },
374 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, 368 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 },
375@@ -1500,7 +1509,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 369@@ -1508,7 +1517,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
376 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, 370 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 },
377 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, 371 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 },
378 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, 372 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -381,7 +375,7 @@ index 5cb8e7365f..f2074856a2 100644
381 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 375 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
382 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, 376 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
383 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 377 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
384@@ -1937,9 +1946,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 378@@ -1945,9 +1954,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
385 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, 379 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37},
386 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, 380 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 },
387 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, 381 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 },
@@ -395,5 +389,5 @@ index 5cb8e7365f..f2074856a2 100644
395 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 389 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
396 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, 390 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },
397-- 391--
3982.12.0 3922.14.0
399 393
diff --git a/meta/recipes-devtools/binutils/binutils/0014-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
index bb95a0cb06..247376b7ed 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
+++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
@@ -1,7 +1,7 @@
1From a9177150f808d7e6285e1011c85d0ce89037b553 Mon Sep 17 00:00:00 2001 1From e46202becab625c6c08caf91e08ccbbc1bf799c4 Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com> 2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500 3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH 14/15] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH 13/15] fix the incorrect assembling for ppc wait mnemonic
5 5
6Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> 6Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
7 7
@@ -11,10 +11,10 @@ Upstream-Status: Pending
11 1 file changed, 1 insertion(+), 2 deletions(-) 11 1 file changed, 1 insertion(+), 2 deletions(-)
12 12
13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c 13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
14index 30fd789182..f2708e2276 100644 14index 426261ab21..0d35916cdd 100644
15--- a/opcodes/ppc-opc.c 15--- a/opcodes/ppc-opc.c
16+++ b/opcodes/ppc-opc.c 16+++ b/opcodes/ppc-opc.c
17@@ -4876,7 +4876,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 17@@ -4881,7 +4881,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
18 {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, 18 {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
19 19
20 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, 20 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}},
@@ -22,7 +22,7 @@ index 30fd789182..f2708e2276 100644
22 22
23 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, 23 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
24 24
25@@ -4930,7 +4929,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { 25@@ -4935,7 +4934,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
26 26
27 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 27 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
28 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 28 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
@@ -32,5 +32,5 @@ index 30fd789182..f2708e2276 100644
32 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, 32 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}},
33 33
34-- 34--
352.12.0 352.14.0
36 36
diff --git a/meta/recipes-devtools/binutils/binutils/0016-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
index 1b2eb8485c..42b1065f8d 100644
--- a/meta/recipes-devtools/binutils/binutils/0016-Detect-64-bit-MIPS-targets.patch
+++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
@@ -1,7 +1,7 @@
1From c3ebde5d8cc3b0092966b4d725cad7cfd074fd8d Mon Sep 17 00:00:00 2001 1From bf20d5823662d1f2eb47de2cdfd173627a205b17 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 31 Mar 2017 11:42:03 -0700 3Date: Fri, 31 Mar 2017 11:42:03 -0700
4Subject: [PATCH 16/16] Detect 64-bit MIPS targets 4Subject: [PATCH 14/15] Detect 64-bit MIPS targets
5 5
6Add mips64 target triplets and default to N64 6Add mips64 target triplets and default to N64
7 7
@@ -46,5 +46,5 @@ index 3d63027297..c1f92a1360 100644
46 targ_obj=mips 46 targ_obj=mips
47 targ_machine=EM_MIPS 47 targ_machine=EM_MIPS
48-- 48--
492.12.1 492.14.0
50 50
diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
index 1559038e50..2c8900cb66 100644
--- a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
@@ -1,4 +1,4 @@
1From 58cdb28ed71cb57b4a0ea1b412a708fdb0f84c27 Mon Sep 17 00:00:00 2001 1From 9b456a0e4f284fd41ac36595144ed44dc82410ee Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 6 Mar 2017 23:33:27 -0800 3Date: Mon, 6 Mar 2017 23:33:27 -0800
4Subject: [PATCH 15/15] sync with OE libtool changes 4Subject: [PATCH 15/15] sync with OE libtool changes
@@ -85,5 +85,5 @@ index 11ee684ccc..3b19ac1532 100644
85 elif test -n "$runpath_var"; then 85 elif test -n "$runpath_var"; then
86 case "$finalize_perm_rpath " in 86 case "$finalize_perm_rpath " in
87-- 87--
882.12.0 882.14.0
89 89
diff --git a/meta/recipes-devtools/binutils/binutils/0017-bfd-Improve-lookup-of-file-line-information-for-erro.patch b/meta/recipes-devtools/binutils/binutils/0017-bfd-Improve-lookup-of-file-line-information-for-erro.patch
deleted file mode 100644
index 23ad10ab4a..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0017-bfd-Improve-lookup-of-file-line-information-for-erro.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From 3239a4231ff79bf8b67b8faaf414b1667486167c Mon Sep 17 00:00:00 2001
2From: Andrew Burgess <andrew.burgess@embecosm.com>
3Date: Mon, 19 Dec 2016 15:27:59 +0000
4Subject: [PATCH] bfd: Improve lookup of file / line information for errors
5
6When looking up file and line information (used from the linker to
7report error messages) if no symbol is passed in, then use the symbol
8list to look for a matching symbol.
9
10If a matching symbol is found then use this to look up the file / line
11information.
12
13This should improve errors when looking up file / line information for
14data sections. Hopefully we should find a matching data symbol, which
15should, in turn (we hope) match a DW_TAG_variable in the DWARF, this
16should allow us to give accurate file / line errors for data symbols.
17
18As the hope is to find a matching DW_TAG_variable in the DWARF then we
19ignore section symbols, and prefer global symbols to locals.
20
21CVE: CVE-2017-8392
22Upstream-Status: Accepted
23
24Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
25---
26 bfd/dwarf2.c | 32 ++++++++++++++++++++++++++++++++
27 1 files changed, 32 insertions(+)
28
29
30diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
31index 03447a9..9bb8126 100644
32--- a/bfd/dwarf2.c
33+++ b/bfd/dwarf2.c
34@@ -4155,6 +4155,38 @@ _bfd_dwarf2_find_nearest_line (bfd *abfd,
35 {
36 BFD_ASSERT (section != NULL && functionname_ptr != NULL);
37 addr = offset;
38+
39+ /* If we have no SYMBOL but the section we're looking at is not a
40+ code section, then take a look through the list of symbols to see
41+ if we have a symbol at the address we're looking for. If we do
42+ then use this to look up line information. This will allow us to
43+ give file and line results for data symbols. We exclude code
44+ symbols here, if we look up a function symbol and then look up the
45+ line information we'll actually return the line number for the
46+ opening '{' rather than the function definition line. This is
47+ because looking up by symbol uses the line table, in which the
48+ first line for a function is usually the opening '{', while
49+ looking up the function by section + offset uses the
50+ DW_AT_decl_line from the function DW_TAG_subprogram for the line,
51+ which will be the line of the function name. */
52+ if ((section->flags & SEC_CODE) == 0)
53+ {
54+ asymbol **tmp;
55+
56+ for (tmp = symbols; (*tmp) != NULL; ++tmp)
57+ if ((*tmp)->the_bfd == abfd
58+ && (*tmp)->section == section
59+ && (*tmp)->value == offset
60+ && ((*tmp)->flags & BSF_SECTION_SYM) == 0)
61+ {
62+ symbol = *tmp;
63+ do_line = TRUE;
64+ /* For local symbols, keep going in the hope we find a
65+ global. */
66+ if ((symbol->flags & BSF_GLOBAL) != 0)
67+ break;
68+ }
69+ }
70 }
71
72 if (section->output_section)
73--
741.9.1
75
diff --git a/meta/recipes-devtools/binutils/binutils/0018-PR-21409-segfault-in-_bfd_dwarf2_find_nearest_line.patch b/meta/recipes-devtools/binutils/binutils/0018-PR-21409-segfault-in-_bfd_dwarf2_find_nearest_line.patch
deleted file mode 100644
index acb37df168..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0018-PR-21409-segfault-in-_bfd_dwarf2_find_nearest_line.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 97e83a100aa8250be783304bfe0429761c6e6b6b Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Sun, 23 Apr 2017 13:55:49 +0930
4Subject: [PATCH] PR 21409, segfault in _bfd_dwarf2_find_nearest_line
5
6 PR 21409
7 * dwarf2.c (_bfd_dwarf2_find_nearest_line): Don't segfault when
8 no symbols.
9
10CVE: CVE-2017-8392
11Upstream-Status: Accepted
12
13Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
14---
15 bfd/dwarf2.c | 2 +-
16 1 files changed, 1 insertions(+), 1 deletion(-)
17
18diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
19index 132a674..0ef3e1f 100644
20--- a/bfd/dwarf2.c
21+++ b/bfd/dwarf2.c
22@@ -4205,7 +4205,7 @@ _bfd_dwarf2_find_nearest_line (bfd *abfd,
23 looking up the function by section + offset uses the
24 DW_AT_decl_line from the function DW_TAG_subprogram for the line,
25 which will be the line of the function name. */
26- if ((section->flags & SEC_CODE) == 0)
27+ if (symbols != NULL && (section->flags & SEC_CODE) == 0)
28 {
29 asymbol **tmp;
30
31--
321.9.1
33
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch
deleted file mode 100644
index 6697d4bc95..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch
+++ /dev/null
@@ -1,109 +0,0 @@
1From bdc5166c274b842f83f8328e7cfaaf80fd29934e Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Mon, 13 Feb 2017 13:08:32 +0000
4Subject: [PATCH 1/2] Fix readelf writing to illegal addresses whilst
5 processing corrupt input files containing symbol-difference relocations.
6
7 PR binutils/21137
8 * readelf.c (target_specific_reloc_handling): Add end parameter.
9 Check for buffer overflow before writing relocated values.
10 (apply_relocations): Pass end to target_specific_reloc_handling.
11
12(cherry pick from commit 03f7786e2f440b9892b1c34a58fb26222ce1b493)
13Upstream-Status: Backport [master]
14CVE: CVE-2017-6965
15
16Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
17---
18 binutils/ChangeLog | 7 +++++++
19 binutils/readelf.c | 30 +++++++++++++++++++++++++-----
20 2 files changed, 32 insertions(+), 5 deletions(-)
21
22diff --git a/binutils/readelf.c b/binutils/readelf.c
23index b5f577f5a1..8cdaae3b8c 100644
24--- a/binutils/readelf.c
25+++ b/binutils/readelf.c
26@@ -11585,6 +11585,7 @@ process_syminfo (FILE * file ATTRIBUTE_UNUSED)
27 static bfd_boolean
28 target_specific_reloc_handling (Elf_Internal_Rela * reloc,
29 unsigned char * start,
30+ unsigned char * end,
31 Elf_Internal_Sym * symtab)
32 {
33 unsigned int reloc_type = get_reloc_type (reloc->r_info);
34@@ -11625,13 +11626,19 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
35 handle_sym_diff:
36 if (saved_sym != NULL)
37 {
38+ int reloc_size = reloc_type == 1 ? 4 : 2;
39 bfd_vma value;
40
41 value = reloc->r_addend
42 + (symtab[get_reloc_symindex (reloc->r_info)].st_value
43 - saved_sym->st_value);
44
45- byte_put (start + reloc->r_offset, value, reloc_type == 1 ? 4 : 2);
46+ if (start + reloc->r_offset + reloc_size >= end)
47+ /* PR 21137 */
48+ error (_("MSP430 sym diff reloc writes past end of section (%p vs %p)\n"),
49+ start + reloc->r_offset + reloc_size, end);
50+ else
51+ byte_put (start + reloc->r_offset, value, reloc_size);
52
53 saved_sym = NULL;
54 return TRUE;
55@@ -11662,13 +11669,18 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
56 case 2: /* R_MN10300_16 */
57 if (saved_sym != NULL)
58 {
59+ int reloc_size = reloc_type == 1 ? 4 : 2;
60 bfd_vma value;
61
62 value = reloc->r_addend
63 + (symtab[get_reloc_symindex (reloc->r_info)].st_value
64 - saved_sym->st_value);
65
66- byte_put (start + reloc->r_offset, value, reloc_type == 1 ? 4 : 2);
67+ if (start + reloc->r_offset + reloc_size >= end)
68+ error (_("MN10300 sym diff reloc writes past end of section (%p vs %p)\n"),
69+ start + reloc->r_offset + reloc_size, end);
70+ else
71+ byte_put (start + reloc->r_offset, value, reloc_size);
72
73 saved_sym = NULL;
74 return TRUE;
75@@ -11703,12 +11715,20 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
76 break;
77
78 case 0x41: /* R_RL78_ABS32. */
79- byte_put (start + reloc->r_offset, value, 4);
80+ if (start + reloc->r_offset + 4 >= end)
81+ error (_("RL78 sym diff reloc writes past end of section (%p vs %p)\n"),
82+ start + reloc->r_offset + 2, end);
83+ else
84+ byte_put (start + reloc->r_offset, value, 4);
85 value = 0;
86 return TRUE;
87
88 case 0x43: /* R_RL78_ABS16. */
89- byte_put (start + reloc->r_offset, value, 2);
90+ if (start + reloc->r_offset + 2 >= end)
91+ error (_("RL78 sym diff reloc writes past end of section (%p vs %p)\n"),
92+ start + reloc->r_offset + 2, end);
93+ else
94+ byte_put (start + reloc->r_offset, value, 2);
95 value = 0;
96 return TRUE;
97
98@@ -12325,7 +12345,7 @@ apply_relocations (void * file,
99
100 reloc_type = get_reloc_type (rp->r_info);
101
102- if (target_specific_reloc_handling (rp, start, symtab))
103+ if (target_specific_reloc_handling (rp, start, end, symtab))
104 continue;
105 else if (is_none_reloc (reloc_type))
106 continue;
107--
1082.11.0
109
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch
deleted file mode 100644
index 206e493b6e..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch
+++ /dev/null
@@ -1,221 +0,0 @@
1From 383ec757d27652448d1511169e1133f486abf54f Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Mon, 13 Feb 2017 14:03:22 +0000
4Subject: [PATCH] Fix read-after-free error in readelf when processing
5 multiple, relocated sections in an MSP430 binary.
6
7 PR binutils/21139
8 * readelf.c (target_specific_reloc_handling): Add num_syms
9 parameter. Check for symbol table overflow before accessing
10 symbol value. If reloc pointer is NULL, discard all saved state.
11 (apply_relocations): Pass num_syms to target_specific_reloc_handling.
12 Call target_specific_reloc_handling with a NULL reloc pointer
13 after processing all of the relocs.
14
15(cherry pick from commit f84ce13b6708801ca1d6289b7c4003e2f5a6d7f9)
16Upstream-Status: Backport [master]
17CVE: CVE-2017-6966
18
19Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
20---
21 binutils/ChangeLog | 10 +++++
22 binutils/readelf.c | 109 +++++++++++++++++++++++++++++++++++++++++------------
23 2 files changed, 94 insertions(+), 25 deletions(-)
24
25diff --git a/binutils/readelf.c b/binutils/readelf.c
26index 8cdaae3b8c..7c158c6342 100644
27--- a/binutils/readelf.c
28+++ b/binutils/readelf.c
29@@ -11580,15 +11580,27 @@ process_syminfo (FILE * file ATTRIBUTE_UNUSED)
30
31 /* Check to see if the given reloc needs to be handled in a target specific
32 manner. If so then process the reloc and return TRUE otherwise return
33- FALSE. */
34+ FALSE.
35+
36+ If called with reloc == NULL, then this is a signal that reloc processing
37+ for the current section has finished, and any saved state should be
38+ discarded. */
39
40 static bfd_boolean
41 target_specific_reloc_handling (Elf_Internal_Rela * reloc,
42 unsigned char * start,
43 unsigned char * end,
44- Elf_Internal_Sym * symtab)
45+ Elf_Internal_Sym * symtab,
46+ unsigned long num_syms)
47 {
48- unsigned int reloc_type = get_reloc_type (reloc->r_info);
49+ unsigned int reloc_type = 0;
50+ unsigned long sym_index = 0;
51+
52+ if (reloc)
53+ {
54+ reloc_type = get_reloc_type (reloc->r_info);
55+ sym_index = get_reloc_symindex (reloc->r_info);
56+ }
57
58 switch (elf_header.e_machine)
59 {
60@@ -11597,6 +11609,12 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
61 {
62 static Elf_Internal_Sym * saved_sym = NULL;
63
64+ if (reloc == NULL)
65+ {
66+ saved_sym = NULL;
67+ return TRUE;
68+ }
69+
70 switch (reloc_type)
71 {
72 case 10: /* R_MSP430_SYM_DIFF */
73@@ -11604,7 +11622,12 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
74 break;
75 /* Fall through. */
76 case 21: /* R_MSP430X_SYM_DIFF */
77- saved_sym = symtab + get_reloc_symindex (reloc->r_info);
78+ /* PR 21139. */
79+ if (sym_index >= num_syms)
80+ error (_("MSP430 SYM_DIFF reloc contains invalid symbol index %lu\n"),
81+ sym_index);
82+ else
83+ saved_sym = symtab + sym_index;
84 return TRUE;
85
86 case 1: /* R_MSP430_32 or R_MSP430_ABS32 */
87@@ -11629,16 +11652,21 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
88 int reloc_size = reloc_type == 1 ? 4 : 2;
89 bfd_vma value;
90
91- value = reloc->r_addend
92- + (symtab[get_reloc_symindex (reloc->r_info)].st_value
93- - saved_sym->st_value);
94-
95- if (start + reloc->r_offset + reloc_size >= end)
96- /* PR 21137 */
97- error (_("MSP430 sym diff reloc writes past end of section (%p vs %p)\n"),
98- start + reloc->r_offset + reloc_size, end);
99+ if (sym_index >= num_syms)
100+ error (_("MSP430 reloc contains invalid symbol index %lu\n"),
101+ sym_index);
102 else
103- byte_put (start + reloc->r_offset, value, reloc_size);
104+ {
105+ value = reloc->r_addend + (symtab[sym_index].st_value
106+ - saved_sym->st_value);
107+
108+ if (start + reloc->r_offset + reloc_size >= end)
109+ /* PR 21137 */
110+ error (_("MSP430 sym diff reloc writes past end of section (%p vs %p)\n"),
111+ start + reloc->r_offset + reloc_size, end);
112+ else
113+ byte_put (start + reloc->r_offset, value, reloc_size);
114+ }
115
116 saved_sym = NULL;
117 return TRUE;
118@@ -11658,13 +11686,24 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
119 {
120 static Elf_Internal_Sym * saved_sym = NULL;
121
122+ if (reloc == NULL)
123+ {
124+ saved_sym = NULL;
125+ return TRUE;
126+ }
127+
128 switch (reloc_type)
129 {
130 case 34: /* R_MN10300_ALIGN */
131 return TRUE;
132 case 33: /* R_MN10300_SYM_DIFF */
133- saved_sym = symtab + get_reloc_symindex (reloc->r_info);
134+ if (sym_index >= num_syms)
135+ error (_("MN10300_SYM_DIFF reloc contains invalid symbol index %lu\n"),
136+ sym_index);
137+ else
138+ saved_sym = symtab + sym_index;
139 return TRUE;
140+
141 case 1: /* R_MN10300_32 */
142 case 2: /* R_MN10300_16 */
143 if (saved_sym != NULL)
144@@ -11672,15 +11711,20 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
145 int reloc_size = reloc_type == 1 ? 4 : 2;
146 bfd_vma value;
147
148- value = reloc->r_addend
149- + (symtab[get_reloc_symindex (reloc->r_info)].st_value
150- - saved_sym->st_value);
151-
152- if (start + reloc->r_offset + reloc_size >= end)
153- error (_("MN10300 sym diff reloc writes past end of section (%p vs %p)\n"),
154- start + reloc->r_offset + reloc_size, end);
155+ if (sym_index >= num_syms)
156+ error (_("MN10300 reloc contains invalid symbol index %lu\n"),
157+ sym_index);
158 else
159- byte_put (start + reloc->r_offset, value, reloc_size);
160+ {
161+ value = reloc->r_addend + (symtab[sym_index].st_value
162+ - saved_sym->st_value);
163+
164+ if (start + reloc->r_offset + reloc_size >= end)
165+ error (_("MN10300 sym diff reloc writes past end of section (%p vs %p)\n"),
166+ start + reloc->r_offset + reloc_size, end);
167+ else
168+ byte_put (start + reloc->r_offset, value, reloc_size);
169+ }
170
171 saved_sym = NULL;
172 return TRUE;
173@@ -11700,12 +11744,24 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc,
174 static bfd_vma saved_sym2 = 0;
175 static bfd_vma value;
176
177+ if (reloc == NULL)
178+ {
179+ saved_sym1 = saved_sym2 = 0;
180+ return TRUE;
181+ }
182+
183 switch (reloc_type)
184 {
185 case 0x80: /* R_RL78_SYM. */
186 saved_sym1 = saved_sym2;
187- saved_sym2 = symtab[get_reloc_symindex (reloc->r_info)].st_value;
188- saved_sym2 += reloc->r_addend;
189+ if (sym_index >= num_syms)
190+ error (_("RL78_SYM reloc contains invalid symbol index %lu\n"),
191+ sym_index);
192+ else
193+ {
194+ saved_sym2 = symtab[sym_index].st_value;
195+ saved_sym2 += reloc->r_addend;
196+ }
197 return TRUE;
198
199 case 0x83: /* R_RL78_OPsub. */
200@@ -12345,7 +12401,7 @@ apply_relocations (void * file,
201
202 reloc_type = get_reloc_type (rp->r_info);
203
204- if (target_specific_reloc_handling (rp, start, end, symtab))
205+ if (target_specific_reloc_handling (rp, start, end, symtab, num_syms))
206 continue;
207 else if (is_none_reloc (reloc_type))
208 continue;
209@@ -12441,6 +12497,9 @@ apply_relocations (void * file,
210 }
211
212 free (symtab);
213+ /* Let the target specific reloc processing code know that
214+ we have finished with these relocs. */
215+ target_specific_reloc_handling (NULL, NULL, NULL, NULL, 0);
216
217 if (relocs_return)
218 {
219--
2202.11.0
221
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6969.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6969.patch
deleted file mode 100644
index 7dfa3d87c3..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2017-6969.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 1d9a2696903fc59d6a936f4ab4e4407ef329d066 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Fri, 17 Feb 2017 15:59:45 +0000
4Subject: Fix illegal memory accesses in readelf when parsing
5 a corrupt binary.
6
7 PR binutils/21156
8 * readelf.c (find_section_in_set): Test for invalid section
9 indicies.
10
11CVE: CVE-2017-6969
12Upstream-Status: Backport [master]
13
14Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
15---
16 binutils/ChangeLog | 6 ++++++
17 binutils/readelf.c | 10 ++++++++--
18 2 files changed, 14 insertions(+), 2 deletions(-)
19
20diff --git a/binutils/readelf.c b/binutils/readelf.c
21index 7c158c6342..4960491c5c 100644
22--- a/binutils/readelf.c
23+++ b/binutils/readelf.c
24@@ -675,8 +675,14 @@ find_section_in_set (const char * name, unsigned int * set)
25 if (set != NULL)
26 {
27 while ((i = *set++) > 0)
28- if (streq (SECTION_NAME (section_headers + i), name))
29- return section_headers + i;
30+ {
31+ /* See PR 21156 for a reproducer. */
32+ if (i >= elf_header.e_shnum)
33+ continue; /* FIXME: Should we issue an error message ? */
34+
35+ if (streq (SECTION_NAME (section_headers + i), name))
36+ return section_headers + i;
37+ }
38 }
39
40 return find_section (name);
41--
422.11.0
43
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6969_2.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6969_2.patch
deleted file mode 100644
index 5409511a7c..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2017-6969_2.patch
+++ /dev/null
@@ -1,104 +0,0 @@
1From ef81126314f67472a46db9581530fbf5ccb6b3f2 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Mon, 20 Feb 2017 14:40:39 +0000
4Subject: Fix another memory access error in readelf when
5 parsing a corrupt binary.
6
7 PR binutils/21156
8 * dwarf.c (cu_tu_indexes_read): Move into...
9 (load_cu_tu_indexes): ... here. Change the variable into
10 tri-state. Change the function into boolean, returning
11 false if the indicies could not be loaded.
12 (find_cu_tu_set): Return NULL if the indicies could not be
13 loaded.
14
15CVE: CVE-2017-6969
16Upstream-Status: Backport [master]
17
18Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
19---
20 binutils/ChangeLog | 10 ++++++++++
21 binutils/dwarf.c | 34 ++++++++++++++++++++--------------
22 2 files changed, 30 insertions(+), 14 deletions(-)
23
24diff --git a/binutils/dwarf.c b/binutils/dwarf.c
25index 0184a7ab2e..6d879c9b61 100644
26--- a/binutils/dwarf.c
27+++ b/binutils/dwarf.c
28@@ -76,7 +76,6 @@ int dwarf_check = 0;
29 as a zero-terminated list of section indexes comprising one set of debug
30 sections from a .dwo file. */
31
32-static int cu_tu_indexes_read = 0;
33 static unsigned int *shndx_pool = NULL;
34 static unsigned int shndx_pool_size = 0;
35 static unsigned int shndx_pool_used = 0;
36@@ -99,7 +98,7 @@ static int tu_count = 0;
37 static struct cu_tu_set *cu_sets = NULL;
38 static struct cu_tu_set *tu_sets = NULL;
39
40-static void load_cu_tu_indexes (void *file);
41+static bfd_boolean load_cu_tu_indexes (void *);
42
43 /* Values for do_debug_lines. */
44 #define FLAG_DEBUG_LINES_RAW 1
45@@ -2715,7 +2714,7 @@ load_debug_info (void * file)
46 return num_debug_info_entries;
47
48 /* If this is a DWARF package file, load the CU and TU indexes. */
49- load_cu_tu_indexes (file);
50+ (void) load_cu_tu_indexes (file);
51
52 if (load_debug_section (info, file)
53 && process_debug_info (&debug_displays [info].section, file, abbrev, 1, 0))
54@@ -7378,21 +7377,27 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
55 section sets that we can use to associate a .debug_info.dwo section
56 with its associated .debug_abbrev.dwo section in a .dwp file. */
57
58-static void
59+static bfd_boolean
60 load_cu_tu_indexes (void *file)
61 {
62+ static int cu_tu_indexes_read = -1; /* Tri-state variable. */
63+
64 /* If we have already loaded (or tried to load) the CU and TU indexes
65 then do not bother to repeat the task. */
66- if (cu_tu_indexes_read)
67- return;
68-
69- if (load_debug_section (dwp_cu_index, file))
70- process_cu_tu_index (&debug_displays [dwp_cu_index].section, 0);
71-
72- if (load_debug_section (dwp_tu_index, file))
73- process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0);
74+ if (cu_tu_indexes_read == -1)
75+ {
76+ cu_tu_indexes_read = TRUE;
77+
78+ if (load_debug_section (dwp_cu_index, file))
79+ if (! process_cu_tu_index (&debug_displays [dwp_cu_index].section, 0))
80+ cu_tu_indexes_read = FALSE;
81+
82+ if (load_debug_section (dwp_tu_index, file))
83+ if (! process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0))
84+ cu_tu_indexes_read = FALSE;
85+ }
86
87- cu_tu_indexes_read = 1;
88+ return (bfd_boolean) cu_tu_indexes_read;
89 }
90
91 /* Find the set of sections that includes section SHNDX. */
92@@ -7402,7 +7407,8 @@ find_cu_tu_set (void *file, unsigned int shndx)
93 {
94 unsigned int i;
95
96- load_cu_tu_indexes (file);
97+ if (! load_cu_tu_indexes (file))
98+ return NULL;
99
100 /* Find SHNDX in the shndx pool. */
101 for (i = 0; i < shndx_pool_used; i++)
102--
1032.11.0
104
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-7209.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-7209.patch
deleted file mode 100644
index b14441b4e3..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2017-7209.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From b2706ceadac7239e7b02d43f05100fc6538b0d65 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Mon, 13 Feb 2017 15:04:37 +0000
4Subject: Fix invalid read of section contents whilst processing a corrupt binary.
5
6 PR binutils/21135
7 * readelf.c (dump_section_as_bytes): Handle the case where
8 uncompress_section_contents returns false.
9
10CVE: CVE-2017-7209
11Upstream-Status: Backport[master]
12
13Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
14---
15 binutils/ChangeLog | 6 ++++++
16 binutils/readelf.c | 16 ++++++++++++----
17 2 files changed, 18 insertions(+), 4 deletions(-)
18
19diff --git a/binutils/readelf.c b/binutils/readelf.c
20index 4960491c5c..f0e7b080e8 100644
21--- a/binutils/readelf.c
22+++ b/binutils/readelf.c
23@@ -12803,10 +12803,18 @@ dump_section_as_bytes (Elf_Internal_Shdr * section,
24 new_size -= 12;
25 }
26
27- if (uncompressed_size
28- && uncompress_section_contents (& start, uncompressed_size,
29- & new_size))
30- section_size = new_size;
31+ if (uncompressed_size)
32+ {
33+ if (uncompress_section_contents (& start, uncompressed_size,
34+ & new_size))
35+ section_size = new_size;
36+ else
37+ {
38+ error (_("Unable to decompress section %s\n"),
39+ printable_section_name (section));
40+ return;
41+ }
42+ }
43 }
44
45 if (relocate)
46--
472.11.0
48
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-7210.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-7210.patch
deleted file mode 100644
index f8ad32f4f8..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2017-7210.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 4da598a472e1d298825035e452e3bc68f714311c Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Tue, 14 Feb 2017 14:07:29 +0000
4Subject: Fix handling of corrupt STABS enum type strings.
5
6 PR binutils/21157
7 * stabs.c (parse_stab_enum_type): Check for corrupt NAME:VALUE
8 pairs.
9 (parse_number): Exit early if passed an empty string.
10
11CVE: CVE-2017-7210
12Upstream-Status: Backport [master]
13
14Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
15---
16 binutils/ChangeLog | 7 +++++++
17 binutils/stabs.c | 14 +++++++++++++-
18 2 files changed, 20 insertions(+), 1 deletion(-)
19
20diff --git a/binutils/stabs.c b/binutils/stabs.c
21index f5c5d2d8e0..5d013cc361 100644
22--- a/binutils/stabs.c
23+++ b/binutils/stabs.c
24@@ -232,6 +232,10 @@ parse_number (const char **pp, bfd_boolean *poverflow)
25
26 orig = *pp;
27
28+ /* Stop early if we are passed an empty string. */
29+ if (*orig == 0)
30+ return (bfd_vma) 0;
31+
32 errno = 0;
33 ul = strtoul (*pp, (char **) pp, 0);
34 if (ul + 1 != 0 || errno == 0)
35@@ -1975,9 +1979,17 @@ parse_stab_enum_type (void *dhandle, const char **pp)
36 bfd_signed_vma val;
37
38 p = *pp;
39- while (*p != ':')
40+ while (*p != ':' && *p != 0)
41 ++p;
42
43+ if (*p == 0)
44+ {
45+ bad_stab (orig);
46+ free (names);
47+ free (values);
48+ return DEBUG_TYPE_NULL;
49+ }
50+
51 name = savestring (*pp, p - *pp);
52
53 *pp = p + 1;
54--
552.11.0
56
diff --git a/meta/recipes-devtools/binutils/binutils_2.28.bb b/meta/recipes-devtools/binutils/binutils_2.29.bb
index 51a9748906..51a9748906 100644
--- a/meta/recipes-devtools/binutils/binutils_2.28.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.29.bb