summaryrefslogtreecommitdiff
path: root/meta-linaro-toolchain/recipes-devtools/gcc
diff options
context:
space:
mode:
authorKoen Kooi <koen@linaro.org>2016-02-12 14:14:06 +0100
committerKoen Kooi <koen.kooi@linaro.org>2016-02-12 14:18:21 +0100
commit0fe3921b0d366c90768ce7297c159572a8209b76 (patch)
treee24e38db6cf9c939e92f8167e4a6aed95dee36d3 /meta-linaro-toolchain/recipes-devtools/gcc
parentfeb294b4b777792f90b76beef2df36c40eadc730 (diff)
downloadmeta-linaro-0fe3921b0d366c90768ce7297c159572a8209b76.tar.gz
gcc-linaro-5.2: add patch for gcc PR67954
This also fixes https://bugs.linaro.org/show_bug.cgi?id=2034 Change-Id: Ic4dab9dff0403202e21275119e118cc05ac04954 Signed-off-by: Koen Kooi <koen@linaro.org>
Diffstat (limited to 'meta-linaro-toolchain/recipes-devtools/gcc')
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/PR67954.patch43
2 files changed, 45 insertions, 1 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc
index 3df54f2..ca44d66 100644
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc
@@ -107,7 +107,8 @@ SRC_URI = "https://releases.linaro.org/components/toolchain/gcc-linaro/${BASEPV}
file://0040-nativesdk-gcc-support.patch \
file://0041-handle-target-sysroot-multilib.patch \
file://0042-cxxflags-for-build.patch \
- "
+ file://PR67954.patch \
+ "
# file://0038-fix-g++-sysroot.patch
# file://AArch64-Define-BE-loader-name-default-be.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/PR67954.patch b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/PR67954.patch
new file mode 100644
index 0000000..198136b
--- /dev/null
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/PR67954.patch
@@ -0,0 +1,43 @@
+From patchwork Wed Nov 25 17:59:13 2015
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: patch to fix PR67954
+From: Vladimir Makarov <vmakarov@redhat.com>
+X-Patchwork-Id: 548683
+Message-Id: <5655F6F1.4020304@redhat.com>
+To: gcc-patches <gcc-patches@gcc.gnu.org>
+Date: Wed, 25 Nov 2015 12:59:13 -0500
+
+The following patch fixes
+
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67954
+
+The patch was bootstrapped on x86/x86-64. The test is too big and was
+not included to the patch.
+
+Committed as rev. 230893 to gcc-5 branch and as rev. 230894 to trunk.
+
+Index: lra-constraints.c
+===================================================================
+--- a/gcc/lra-constraints.c (revision 230887)
++++ b/gcc/lra-constraints.c (working copy)
+@@ -3738,7 +3738,8 @@ curr_insn_transform (bool check_only_p)
+ assigment pass and the scratch pseudo will be
+ spilled. Spilled scratch pseudos are transformed
+ back to scratches at the LRA end. */
+- && lra_former_scratch_operand_p (curr_insn, i))
++ && lra_former_scratch_operand_p (curr_insn, i)
++ && lra_former_scratch_p (REGNO (op)))
+ {
+ int regno = REGNO (op);
+ lra_change_class (regno, NO_REGS, " Change to", true);
+@@ -3747,6 +3748,8 @@ curr_insn_transform (bool check_only_p)
+ spilled pseudo as there is only one such insn, the
+ current one. */
+ reg_renumber[regno] = -1;
++ lra_assert (bitmap_single_bit_set_p
++ (&lra_reg_info[REGNO (op)].insn_bitmap));
+ }
+ /* We can do an optional reload. If the pseudo got a hard
+ reg, we might improve the code through inheritance. If