summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-04-07 15:26:10 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-12-21 13:27:55 (GMT)
commit1b58eb0054c41c37a9c23437ee98b8fe6303b018 (patch)
tree5cfa9a390d74f33963445c35c969c910f134a629
parentd273a0820ef35204ff8e8fb9ba0f9f2534175549 (diff)
downloadmeta-phytec-1.8.1-phy2-fix.zip
meta-phytec-1.8.1-phy2-fix.tar.bz2
gcc: backporting of r2121781.8.1-phy2-fix11.8.1-phy2-fix
This fixes a bug when building qt5 libraries with cortexa8 toolchain. This is a forward port of f779692222b4c19a69811b0afbf2741585dfe681 from the meta-phytec dizzy branch, as the upstream patch is not back ported to fido from poky master. TODO: remind fido maintainer to back port da1a2888f64f71da12d6fc9e562a9842b50814b5. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-devtools/gcc/gcc-4.9/0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch39
-rw-r--r--recipes-devtools/gcc/gcc-source_4.9.bbappend2
2 files changed, 41 insertions, 0 deletions
diff --git a/recipes-devtools/gcc/gcc-4.9/0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch b/recipes-devtools/gcc/gcc-4.9/0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch
new file mode 100644
index 0000000..c0ea62f
--- /dev/null
+++ b/recipes-devtools/gcc/gcc-4.9/0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch
@@ -0,0 +1,39 @@
+From b30ffb8097749fdb55704aa7d8307ca1a58255d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
+Date: Tue, 7 Apr 2015 16:15:11 +0200
+Subject: [PATCH] gcc/var-tracking.c: backport from gcc trunk r212178
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+resolves a bug seen on cortexa8 building qt5 libraries.
+
+2014-06-30 Joseph Myers <joseph@codesourcery.com>
+
+ * var-tracking.c (add_stores): Return instead of asserting if old
+ and new values for conditional store are the same.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212178 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
+---
+ gcc/var-tracking.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
+index 65d8285..7c38910 100644
+--- a/gcc/var-tracking.c
++++ b/gcc/var-tracking.c
+@@ -5997,7 +5997,8 @@ add_stores (rtx loc, const_rtx expr, void *cuip)
+ {
+ cselib_val *oval = cselib_lookup (oloc, GET_MODE (oloc), 0, VOIDmode);
+
+- gcc_assert (oval != v);
++ if (oval == v)
++ return;
+ gcc_assert (REG_P (oloc) || MEM_P (oloc));
+
+ if (oval && !cselib_preserved_value_p (oval))
+--
+1.9.1
+
diff --git a/recipes-devtools/gcc/gcc-source_4.9.bbappend b/recipes-devtools/gcc/gcc-source_4.9.bbappend
new file mode 100644
index 0000000..3cbdf29
--- /dev/null
+++ b/recipes-devtools/gcc/gcc-source_4.9.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/gcc-4.9:"
+SRC_URI_append = " file://0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch"