aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2013-10-10 09:03:32 +0000
committerLinaro Code Review <review@review.linaro.org>2013-10-10 09:03:32 +0000
commit3b0488e1785e4472ca075b97fe9d4720250b0328 (patch)
treef79a1ee7a8474fa28802309eadb1a0f04b973d84
parent5a220995d5f13bad97b9d2435f5a32ec75e36ea1 (diff)
parent51bb9e0590a5c9a99a074b74c1cd043b78ab3e93 (diff)
Merge "binutils: sync with oe-core"
-rw-r--r--meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2.inc2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian.inc5
4 files changed, 9 insertions, 2 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2.inc
index eeb1af5b..34a95d7c 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2.inc
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2.inc
@@ -39,6 +39,8 @@ BACKPORT = "\
file://backport/binutils-replace-strncat-with-strcat.patch \
file://backport/0001-config-tc-ppc.c-md_assemble-Do-not-generate-APUinfo-.patch \
file://backport/binutils-fix-skip-whitespace-pr14887.patch \
+ file://backport/aarch64-crn.patch;apply=no \
+ file://backport/aarch64-movi.patch;apply=no \
file://backport/0001-config-tc-ppc.c-PPC_VLE_SPLIT16A-Delete-unused-macro.patch \
file://backport/0002-config-tc-ppc.c-md_apply_fix-Sign-extend-fieldval-un.patch \
file://backport/0001-emultempl-elf32.em-gld-EMULATION_NAME-_before_alloca.patch \
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch
index 3f0338c1..920ccbc3 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch
@@ -3,7 +3,7 @@ Date: Mon, 13 May 2013 22:50:00 +0000 (+0000)
Subject: gas/
X-Git-Url: http://sourceware.org/git/?p=binutils.git;a=commitdiff_plain;h=1796bf893c4729d5c523502318d72cae78495d6c
-Upstream-status: backport
+Upstream-Status: backport
gas/
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch
index 5c7076d2..314eef27 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch
@@ -3,7 +3,7 @@ Date: Mon, 13 May 2013 23:09:51 +0000 (+0000)
Subject: gas/testsuite/
X-Git-Url: http://sourceware.org/git/?p=binutils.git;a=commitdiff_plain;h=f426901e1be0f58fe4e9386cada50ca57d0a4f36
-Upstream-status: backport
+Upstream-Status: backport
gas/testsuite/
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian.inc
index 4658badf..2da90176 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian.inc
@@ -7,6 +7,11 @@ BPN = "binutils"
DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext"
EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \
"
+
+# We have to point binutils at a sysroot but we don't need to rebuild if this changes
+# e.g. we switch between different machines with different tunes.
+EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH"
+
do_install () {
autotools_do_install