[meta-oe][dizzy][PATCH] gcc-4.9: backport from gcc trunk r212178

[meta-oe][dizzy][PATCH] gcc-4.9: backport from gcc trunk r212178

[Stefan Müller-Klieser]

When compiling meta-toolchain-qt5 on cortexa8, the compiler throws an
internal compiler error:

...
qttools-opensource-src-5.3.2/src/linguist/shared/po.cpp:
In function 'bool loadPO(Translator&, QIODevice&, ConversionData&)':
qttools-opensource-src-5.3.2/src/linguist/shared/po.cpp:717:1:
internal compiler error: in add_stores, at var-tracking.c:6000
...

Tracking this down led to https://bugs.linaro.org/show_bug.cgi?id=534
It seems the bug is well know and fixed upstream. So backporting from
trunk seems to be the right solution. This fixes the compiler problem
on cortexa8 and does not seem to be very invasive. The original commit
can be found at:

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>
---
 meta/recipes-devtools/gcc/gcc-4.9.inc              |  1 +
 ...racking.c-backport-from-gcc-trunk-r212178.patch | 39 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index c88a496..e9412e3 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -73,6 +73,7 @@ SRC_URI = "\
     file://0056-top-level-reorder_gcc-bug-61144.patch \
     file://0058-gcc-r212171.patch \
     file://0059-gcc-PR-rtl-optimization-63348.patch \
+    file://0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch \
     file://target-gcc-includedir.patch \
 "
 SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1"
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch b/meta/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/meta/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
+
-- 
1.9.1

Re: [meta-oe][dizzy][PATCH] gcc-4.9: backport from gcc trunk r212178

[Richard Purdie]

On Mon, 2015-04-20 at 12:18 +0200, Stefan Müller-Klieser wrote:
> When compiling meta-toolchain-qt5 on cortexa8, the compiler throws an
> internal compiler error:
> 
> ...
> qttools-opensource-src-5.3.2/src/linguist/shared/po.cpp:
> In function 'bool loadPO(Translator&, QIODevice&, ConversionData&)':
> qttools-opensource-src-5.3.2/src/linguist/shared/po.cpp:717:1:
> internal compiler error: in add_stores, at var-tracking.c:6000
> ...
> 
> Tracking this down led to https://bugs.linaro.org/show_bug.cgi?id=534
> It seems the bug is well know and fixed upstream. So backporting from
> trunk seems to be the right solution. This fixes the compiler problem
> on cortexa8 and does not seem to be very invasive. The original commit
> can be found at:
> 
> 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>
> ---
>  meta/recipes-devtools/gcc/gcc-4.9.inc              |  1 +
>  ...racking.c-backport-from-gcc-trunk-r212178.patch | 39 ++++++++++++++++++++++
>  2 files changed, 40 insertions(+)
>  create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0060-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch

Does this need to be added to master before we can backport to dizzy?

Cheers,

Richard

Re: [meta-oe][dizzy][PATCH] gcc-4.9: backport from gcc trunk r212178

[Stefan Müller-Klieser]

Hi Richard,

Richard Purdie <richard.purdie@linuxfoundation.org> wrote on 04/20/2015 
04:34:20 PM:

> Von: Richard Purdie <richard.purdie@linuxfoundation.org>
> An: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
> Kopie: openembedded-core@lists.openembedded.org
> Datum: 04/20/2015 04:34 PM
> Betreff: Re: [OE-core] [meta-oe][dizzy][PATCH] gcc-4.9: backport 
> from gcc trunk r212178
> 
> On Mon, 2015-04-20 at 12:18 +0200, Stefan Müller-Klieser wrote:
> > When compiling meta-toolchain-qt5 on cortexa8, the compiler throws an
> > internal compiler error:
> > 
> > ...
> > qttools-opensource-src-5.3.2/src/linguist/shared/po.cpp:
> > In function 'bool loadPO(Translator&, QIODevice&, ConversionData&)':
> > qttools-opensource-src-5.3.2/src/linguist/shared/po.cpp:717:1:
> > internal compiler error: in add_stores, at var-tracking.c:6000
> > ...
> > 
> > Tracking this down led to https://bugs.linaro.org/show_bug.cgi?id=534
> > It seems the bug is well know and fixed upstream. So backporting from
> > trunk seems to be the right solution. This fixes the compiler problem
> > on cortexa8 and does not seem to be very invasive. The original commit
> > can be found at:
> > 
> > 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>
> > ---
> >  meta/recipes-devtools/gcc/gcc-4.9.inc              |  1 +
> >  ...racking.c-backport-from-gcc-trunk-r212178.patch | 39 +++++++++
> +++++++++++++
> >  2 files changed, 40 insertions(+)
> >  create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0060-gcc-
> var-tracking.c-backport-from-gcc-trunk-r212178.patch
> 
> Does this need to be added to master before we can backport to dizzy?
I thought Yocto will resolve those dependencies automatically ;-) No for 
real, I don't use master at the moment. But I managed to quickly test the 
patch on master with qt5.3.2 on the beagleboneblack. The bug still exists 
and is fixed with the patch. I will send a new one...

Regards, Stefan

> 
> Cheers,
> 
> Richard
>