Patchwork [dora,PATCHv2] gcc-4.8: backport fix for ICE when building opus

login
register
mail settings
Submitter Martin Jansa
Date July 17, 2014, 11:16 p.m.
Message ID <1405638999-9737-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/75973/
State New
Headers show

Comments

Martin Jansa - July 17, 2014, 11:16 p.m.
From: Martin Jansa <martin.jansa@lge.com>

* backported from 4.8.2, so daisy isn't affected

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
---
 meta/recipes-devtools/gcc/gcc-4.8.inc              |   1 +
 .../gcc-4.8/0001-fix-ICE-when-building-opus.patch  | 121 +++++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
Martin Jansa - July 25, 2014, 12:16 a.m.
On Fri, Jul 18, 2014 at 01:16:39AM +0200, Martin Jansa wrote:
> From: Martin Jansa <martin.jansa@lge.com>
> 
> * backported from 4.8.2, so daisy isn't affected

Robert, any eta on this one? If we cannot expect this to be merged in
dora in next few days, let me know and I'll temporary add it to
.bbappends in our layers.

Regards,

> Signed-off-by: Martin Jansa <martin.jansa@lge.com>
> ---
>  meta/recipes-devtools/gcc/gcc-4.8.inc              |   1 +
>  .../gcc-4.8/0001-fix-ICE-when-building-opus.patch  | 121 +++++++++++++++++++++
>  2 files changed, 122 insertions(+)
>  create mode 100644 meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
> index f1260af..ac205de 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.8.inc
> +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
> @@ -79,6 +79,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
>  	   file://0047-repomembug.patch \
>  	   file://0048-PR57532.patch \
>  	   file://0048-PR58854_fix_arm_apcs_epilogue.patch \
> +           file://0001-fix-ICE-when-building-opus.patch \
>  	  "
>  SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304"
>  SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813"
> diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
> new file mode 100644
> index 0000000..9d3aeaa
> --- /dev/null
> +++ b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
> @@ -0,0 +1,121 @@
> +From 22228d8ba86c70381f7c34c22ac6994234d0f3e7 Mon Sep 17 00:00:00 2001
> +From: xguo <xguo@138bc75d-0d04-0410-961f-82ee72b054a4>
> +Date: Fri, 9 Aug 2013 06:59:01 +0000
> +Subject: [PATCH] gcc/ChangeLog:
> +
> +        Backport from mainline:
> +        2013-08-09  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
> +
> +        * config/arm/neon.md (vcond): Fix floating-point vector
> +        comparisons against 0.
> +
> +gcc/testsuite/ChangeLog:
> +
> +        Backport from mainline:
> +        2013-08-09  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
> +
> +        * gcc.target/arm/lp1189445.c: New testcase.
> +
> +Upstream-Status: Backport from 4.8.2
> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> +
> +More details in:
> +http://gcc.1065356.n5.nabble.com/PATCH-ARM-Fix-unrecognizable-vector-comparisons-td947064.html
> +
> +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@201620 138bc75d-0d04-0410-961f-82ee72b054a4
> +---
> + gcc/ChangeLog                            |  8 ++++++++
> + gcc/config/arm/neon.md                   | 34 +++++++++++++++++++++++++++-----
> + gcc/testsuite/ChangeLog                  |  7 +++++++
> + gcc/testsuite/gcc.target/arm/lp1189445.c | 18 +++++++++++++++++
> + 4 files changed, 62 insertions(+), 5 deletions(-)
> + create mode 100644 gcc/testsuite/gcc.target/arm/lp1189445.c
> +
> +diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md
> +index d8d4202..86a5932 100644
> +--- a/gcc/config/arm/neon.md
> ++++ b/gcc/config/arm/neon.md
> +@@ -1732,6 +1732,7 @@
> + 			     ? 3 : 1;
> +   rtx magic_rtx = GEN_INT (magic_word);
> +   int inverse = 0;
> ++  int use_zero_form = 0;
> +   int swap_bsl_operands = 0;
> +   rtx mask = gen_reg_rtx (<V_cmp_result>mode);
> +   rtx tmp = gen_reg_rtx (<V_cmp_result>mode);
> +@@ -1742,12 +1743,16 @@
> +   switch (GET_CODE (operands[3]))
> +     {
> +     case GE:
> ++    case GT:
> +     case LE:
> ++    case LT:
> +     case EQ:
> +-      if (!REG_P (operands[5])
> +-	  && (operands[5] != CONST0_RTX (<MODE>mode)))
> +-	operands[5] = force_reg (<MODE>mode, operands[5]);
> +-      break;
> ++      if (operands[5] == CONST0_RTX (<MODE>mode))
> ++	{
> ++	  use_zero_form = 1;
> ++	  break;
> ++	}
> ++      /* Fall through.  */
> +     default:
> +       if (!REG_P (operands[5]))
> + 	operands[5] = force_reg (<MODE>mode, operands[5]);
> +@@ -1798,7 +1803,26 @@
> + 	 a GT b -> a GT b
> + 	 a LE b -> b GE a
> + 	 a LT b -> b GT a
> +-	 a EQ b -> a EQ b  */
> ++	 a EQ b -> a EQ b
> ++	 Note that there also exist direct comparison against 0 forms,
> ++	 so catch those as a special case.  */
> ++      if (use_zero_form)
> ++	{
> ++	  inverse = 0;
> ++	  switch (GET_CODE (operands[3]))
> ++	    {
> ++	    case LT:
> ++	      base_comparison = gen_neon_vclt<mode>;
> ++	      break;
> ++	    case LE:
> ++	      base_comparison = gen_neon_vcle<mode>;
> ++	      break;
> ++	    default:
> ++	      /* Do nothing, other zero form cases already have the correct
> ++		 base_comparison.  */
> ++	      break;
> ++	    }
> ++	}
> + 
> +       if (!inverse)
> + 	emit_insn (base_comparison (mask, operands[4], operands[5], magic_rtx));
> +diff --git a/gcc/testsuite/gcc.target/arm/lp1189445.c b/gcc/testsuite/gcc.target/arm/lp1189445.c
> +new file mode 100644
> +index 0000000..766748e
> +--- /dev/null
> ++++ b/gcc/testsuite/gcc.target/arm/lp1189445.c
> +@@ -0,0 +1,18 @@
> ++/* { dg-do compile } */
> ++/* { dg-require-effective-target arm_neon } */
> ++/* { dg-add-options arm_neon } */
> ++/* { dg-options "-O3" } */
> ++
> ++int id;
> ++int
> ++test (const long int *data)
> ++{
> ++  int i, retval;
> ++  retval = id;
> ++  for (i = 0; i < id; i++)
> ++    {
> ++      retval &= (data[i] <= 0);
> ++    }
> ++
> ++  return (retval);
> ++}
> +-- 
> +2.0.0
> +
> -- 
> 2.0.0
>
Robert Yang - July 30, 2014, 2:37 a.m.
On 07/25/2014 08:16 AM, Martin Jansa wrote:
> On Fri, Jul 18, 2014 at 01:16:39AM +0200, Martin Jansa wrote:
>> From: Martin Jansa <martin.jansa@lge.com>
>>
>> * backported from 4.8.2, so daisy isn't affected
>
> Robert, any eta on this one? If we cannot expect this to be merged in
> dora in next few days, let me know and I'll temporary add it to
> .bbappends in our layers.

Sorry for the late response, I tested it and worked well, I will confirm
with RP.

// Robert

>
> Regards,
>
>> Signed-off-by: Martin Jansa <martin.jansa@lge.com>
>> ---
>>   meta/recipes-devtools/gcc/gcc-4.8.inc              |   1 +
>>   .../gcc-4.8/0001-fix-ICE-when-building-opus.patch  | 121 +++++++++++++++++++++
>>   2 files changed, 122 insertions(+)
>>   create mode 100644 meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
>>
>> diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
>> index f1260af..ac205de 100644
>> --- a/meta/recipes-devtools/gcc/gcc-4.8.inc
>> +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
>> @@ -79,6 +79,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
>>   	   file://0047-repomembug.patch \
>>   	   file://0048-PR57532.patch \
>>   	   file://0048-PR58854_fix_arm_apcs_epilogue.patch \
>> +           file://0001-fix-ICE-when-building-opus.patch \
>>   	  "
>>   SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304"
>>   SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813"
>> diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
>> new file mode 100644
>> index 0000000..9d3aeaa
>> --- /dev/null
>> +++ b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
>> @@ -0,0 +1,121 @@
>> +From 22228d8ba86c70381f7c34c22ac6994234d0f3e7 Mon Sep 17 00:00:00 2001
>> +From: xguo <xguo@138bc75d-0d04-0410-961f-82ee72b054a4>
>> +Date: Fri, 9 Aug 2013 06:59:01 +0000
>> +Subject: [PATCH] gcc/ChangeLog:
>> +
>> +        Backport from mainline:
>> +        2013-08-09  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
>> +
>> +        * config/arm/neon.md (vcond): Fix floating-point vector
>> +        comparisons against 0.
>> +
>> +gcc/testsuite/ChangeLog:
>> +
>> +        Backport from mainline:
>> +        2013-08-09  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
>> +
>> +        * gcc.target/arm/lp1189445.c: New testcase.
>> +
>> +Upstream-Status: Backport from 4.8.2
>> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> +
>> +More details in:
>> +http://gcc.1065356.n5.nabble.com/PATCH-ARM-Fix-unrecognizable-vector-comparisons-td947064.html
>> +
>> +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@201620 138bc75d-0d04-0410-961f-82ee72b054a4
>> +---
>> + gcc/ChangeLog                            |  8 ++++++++
>> + gcc/config/arm/neon.md                   | 34 +++++++++++++++++++++++++++-----
>> + gcc/testsuite/ChangeLog                  |  7 +++++++
>> + gcc/testsuite/gcc.target/arm/lp1189445.c | 18 +++++++++++++++++
>> + 4 files changed, 62 insertions(+), 5 deletions(-)
>> + create mode 100644 gcc/testsuite/gcc.target/arm/lp1189445.c
>> +
>> +diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md
>> +index d8d4202..86a5932 100644
>> +--- a/gcc/config/arm/neon.md
>> ++++ b/gcc/config/arm/neon.md
>> +@@ -1732,6 +1732,7 @@
>> + 			     ? 3 : 1;
>> +   rtx magic_rtx = GEN_INT (magic_word);
>> +   int inverse = 0;
>> ++  int use_zero_form = 0;
>> +   int swap_bsl_operands = 0;
>> +   rtx mask = gen_reg_rtx (<V_cmp_result>mode);
>> +   rtx tmp = gen_reg_rtx (<V_cmp_result>mode);
>> +@@ -1742,12 +1743,16 @@
>> +   switch (GET_CODE (operands[3]))
>> +     {
>> +     case GE:
>> ++    case GT:
>> +     case LE:
>> ++    case LT:
>> +     case EQ:
>> +-      if (!REG_P (operands[5])
>> +-	  && (operands[5] != CONST0_RTX (<MODE>mode)))
>> +-	operands[5] = force_reg (<MODE>mode, operands[5]);
>> +-      break;
>> ++      if (operands[5] == CONST0_RTX (<MODE>mode))
>> ++	{
>> ++	  use_zero_form = 1;
>> ++	  break;
>> ++	}
>> ++      /* Fall through.  */
>> +     default:
>> +       if (!REG_P (operands[5]))
>> + 	operands[5] = force_reg (<MODE>mode, operands[5]);
>> +@@ -1798,7 +1803,26 @@
>> + 	 a GT b -> a GT b
>> + 	 a LE b -> b GE a
>> + 	 a LT b -> b GT a
>> +-	 a EQ b -> a EQ b  */
>> ++	 a EQ b -> a EQ b
>> ++	 Note that there also exist direct comparison against 0 forms,
>> ++	 so catch those as a special case.  */
>> ++      if (use_zero_form)
>> ++	{
>> ++	  inverse = 0;
>> ++	  switch (GET_CODE (operands[3]))
>> ++	    {
>> ++	    case LT:
>> ++	      base_comparison = gen_neon_vclt<mode>;
>> ++	      break;
>> ++	    case LE:
>> ++	      base_comparison = gen_neon_vcle<mode>;
>> ++	      break;
>> ++	    default:
>> ++	      /* Do nothing, other zero form cases already have the correct
>> ++		 base_comparison.  */
>> ++	      break;
>> ++	    }
>> ++	}
>> +
>> +       if (!inverse)
>> + 	emit_insn (base_comparison (mask, operands[4], operands[5], magic_rtx));
>> +diff --git a/gcc/testsuite/gcc.target/arm/lp1189445.c b/gcc/testsuite/gcc.target/arm/lp1189445.c
>> +new file mode 100644
>> +index 0000000..766748e
>> +--- /dev/null
>> ++++ b/gcc/testsuite/gcc.target/arm/lp1189445.c
>> +@@ -0,0 +1,18 @@
>> ++/* { dg-do compile } */
>> ++/* { dg-require-effective-target arm_neon } */
>> ++/* { dg-add-options arm_neon } */
>> ++/* { dg-options "-O3" } */
>> ++
>> ++int id;
>> ++int
>> ++test (const long int *data)
>> ++{
>> ++  int i, retval;
>> ++  retval = id;
>> ++  for (i = 0; i < id; i++)
>> ++    {
>> ++      retval &= (data[i] <= 0);
>> ++    }
>> ++
>> ++  return (retval);
>> ++}
>> +--
>> +2.0.0
>> +
>> --
>> 2.0.0
>>
>
Martin Jansa - Aug. 11, 2014, 11:04 a.m.
On Wed, Jul 30, 2014 at 10:37:10AM +0800, Robert Yang wrote:
> 
> On 07/25/2014 08:16 AM, Martin Jansa wrote:
> > On Fri, Jul 18, 2014 at 01:16:39AM +0200, Martin Jansa wrote:
> >> From: Martin Jansa <martin.jansa@lge.com>
> >>
> >> * backported from 4.8.2, so daisy isn't affected
> >
> > Robert, any eta on this one? If we cannot expect this to be merged in
> > dora in next few days, let me know and I'll temporary add it to
> > .bbappends in our layers.
> 
> Sorry for the late response, I tested it and worked well, I will confirm
> with RP.

There were some dora changes merged today, but this one wasn't one of
them, is there some issue with it?

> > Regards,
> >
> >> Signed-off-by: Martin Jansa <martin.jansa@lge.com>
> >> ---
> >>   meta/recipes-devtools/gcc/gcc-4.8.inc              |   1 +
> >>   .../gcc-4.8/0001-fix-ICE-when-building-opus.patch  | 121 +++++++++++++++++++++
> >>   2 files changed, 122 insertions(+)
> >>   create mode 100644 meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
> >>
> >> diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
> >> index f1260af..ac205de 100644
> >> --- a/meta/recipes-devtools/gcc/gcc-4.8.inc
> >> +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
> >> @@ -79,6 +79,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
> >>   	   file://0047-repomembug.patch \
> >>   	   file://0048-PR57532.patch \
> >>   	   file://0048-PR58854_fix_arm_apcs_epilogue.patch \
> >> +           file://0001-fix-ICE-when-building-opus.patch \
> >>   	  "
> >>   SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304"
> >>   SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813"
> >> diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
> >> new file mode 100644
> >> index 0000000..9d3aeaa
> >> --- /dev/null
> >> +++ b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
> >> @@ -0,0 +1,121 @@
> >> +From 22228d8ba86c70381f7c34c22ac6994234d0f3e7 Mon Sep 17 00:00:00 2001
> >> +From: xguo <xguo@138bc75d-0d04-0410-961f-82ee72b054a4>
> >> +Date: Fri, 9 Aug 2013 06:59:01 +0000
> >> +Subject: [PATCH] gcc/ChangeLog:
> >> +
> >> +        Backport from mainline:
> >> +        2013-08-09  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
> >> +
> >> +        * config/arm/neon.md (vcond): Fix floating-point vector
> >> +        comparisons against 0.
> >> +
> >> +gcc/testsuite/ChangeLog:
> >> +
> >> +        Backport from mainline:
> >> +        2013-08-09  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
> >> +
> >> +        * gcc.target/arm/lp1189445.c: New testcase.
> >> +
> >> +Upstream-Status: Backport from 4.8.2
> >> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >> +
> >> +More details in:
> >> +http://gcc.1065356.n5.nabble.com/PATCH-ARM-Fix-unrecognizable-vector-comparisons-td947064.html
> >> +
> >> +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@201620 138bc75d-0d04-0410-961f-82ee72b054a4
> >> +---
> >> + gcc/ChangeLog                            |  8 ++++++++
> >> + gcc/config/arm/neon.md                   | 34 +++++++++++++++++++++++++++-----
> >> + gcc/testsuite/ChangeLog                  |  7 +++++++
> >> + gcc/testsuite/gcc.target/arm/lp1189445.c | 18 +++++++++++++++++
> >> + 4 files changed, 62 insertions(+), 5 deletions(-)
> >> + create mode 100644 gcc/testsuite/gcc.target/arm/lp1189445.c
> >> +
> >> +diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md
> >> +index d8d4202..86a5932 100644
> >> +--- a/gcc/config/arm/neon.md
> >> ++++ b/gcc/config/arm/neon.md
> >> +@@ -1732,6 +1732,7 @@
> >> + 			     ? 3 : 1;
> >> +   rtx magic_rtx = GEN_INT (magic_word);
> >> +   int inverse = 0;
> >> ++  int use_zero_form = 0;
> >> +   int swap_bsl_operands = 0;
> >> +   rtx mask = gen_reg_rtx (<V_cmp_result>mode);
> >> +   rtx tmp = gen_reg_rtx (<V_cmp_result>mode);
> >> +@@ -1742,12 +1743,16 @@
> >> +   switch (GET_CODE (operands[3]))
> >> +     {
> >> +     case GE:
> >> ++    case GT:
> >> +     case LE:
> >> ++    case LT:
> >> +     case EQ:
> >> +-      if (!REG_P (operands[5])
> >> +-	  && (operands[5] != CONST0_RTX (<MODE>mode)))
> >> +-	operands[5] = force_reg (<MODE>mode, operands[5]);
> >> +-      break;
> >> ++      if (operands[5] == CONST0_RTX (<MODE>mode))
> >> ++	{
> >> ++	  use_zero_form = 1;
> >> ++	  break;
> >> ++	}
> >> ++      /* Fall through.  */
> >> +     default:
> >> +       if (!REG_P (operands[5]))
> >> + 	operands[5] = force_reg (<MODE>mode, operands[5]);
> >> +@@ -1798,7 +1803,26 @@
> >> + 	 a GT b -> a GT b
> >> + 	 a LE b -> b GE a
> >> + 	 a LT b -> b GT a
> >> +-	 a EQ b -> a EQ b  */
> >> ++	 a EQ b -> a EQ b
> >> ++	 Note that there also exist direct comparison against 0 forms,
> >> ++	 so catch those as a special case.  */
> >> ++      if (use_zero_form)
> >> ++	{
> >> ++	  inverse = 0;
> >> ++	  switch (GET_CODE (operands[3]))
> >> ++	    {
> >> ++	    case LT:
> >> ++	      base_comparison = gen_neon_vclt<mode>;
> >> ++	      break;
> >> ++	    case LE:
> >> ++	      base_comparison = gen_neon_vcle<mode>;
> >> ++	      break;
> >> ++	    default:
> >> ++	      /* Do nothing, other zero form cases already have the correct
> >> ++		 base_comparison.  */
> >> ++	      break;
> >> ++	    }
> >> ++	}
> >> +
> >> +       if (!inverse)
> >> + 	emit_insn (base_comparison (mask, operands[4], operands[5], magic_rtx));
> >> +diff --git a/gcc/testsuite/gcc.target/arm/lp1189445.c b/gcc/testsuite/gcc.target/arm/lp1189445.c
> >> +new file mode 100644
> >> +index 0000000..766748e
> >> +--- /dev/null
> >> ++++ b/gcc/testsuite/gcc.target/arm/lp1189445.c
> >> +@@ -0,0 +1,18 @@
> >> ++/* { dg-do compile } */
> >> ++/* { dg-require-effective-target arm_neon } */
> >> ++/* { dg-add-options arm_neon } */
> >> ++/* { dg-options "-O3" } */
> >> ++
> >> ++int id;
> >> ++int
> >> ++test (const long int *data)
> >> ++{
> >> ++  int i, retval;
> >> ++  retval = id;
> >> ++  for (i = 0; i < id; i++)
> >> ++    {
> >> ++      retval &= (data[i] <= 0);
> >> ++    }
> >> ++
> >> ++  return (retval);
> >> ++}
> >> +--
> >> +2.0.0
> >> +
> >> --
> >> 2.0.0
> >>
> >
Richard Purdie - Aug. 11, 2014, 11:09 a.m.
On Mon, 2014-08-11 at 13:04 +0200, Martin Jansa wrote:
> On Wed, Jul 30, 2014 at 10:37:10AM +0800, Robert Yang wrote:
> > 
> > On 07/25/2014 08:16 AM, Martin Jansa wrote:
> > > On Fri, Jul 18, 2014 at 01:16:39AM +0200, Martin Jansa wrote:
> > >> From: Martin Jansa <martin.jansa@lge.com>
> > >>
> > >> * backported from 4.8.2, so daisy isn't affected
> > >
> > > Robert, any eta on this one? If we cannot expect this to be merged in
> > > dora in next few days, let me know and I'll temporary add it to
> > > .bbappends in our layers.
> > 
> > Sorry for the late response, I tested it and worked well, I will confirm
> > with RP.
> 
> There were some dora changes merged today, but this one wasn't one of
> them, is there some issue with it?

No issue, its in now, thanks for the reminder.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
index f1260af..ac205de 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -79,6 +79,7 @@  SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://0047-repomembug.patch \
 	   file://0048-PR57532.patch \
 	   file://0048-PR58854_fix_arm_apcs_epilogue.patch \
+           file://0001-fix-ICE-when-building-opus.patch \
 	  "
 SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304"
 SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813"
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
new file mode 100644
index 0000000..9d3aeaa
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
@@ -0,0 +1,121 @@ 
+From 22228d8ba86c70381f7c34c22ac6994234d0f3e7 Mon Sep 17 00:00:00 2001
+From: xguo <xguo@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Fri, 9 Aug 2013 06:59:01 +0000
+Subject: [PATCH] gcc/ChangeLog:
+
+        Backport from mainline:
+        2013-08-09  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
+
+        * config/arm/neon.md (vcond): Fix floating-point vector
+        comparisons against 0.
+
+gcc/testsuite/ChangeLog:
+
+        Backport from mainline:
+        2013-08-09  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
+
+        * gcc.target/arm/lp1189445.c: New testcase.
+
+Upstream-Status: Backport from 4.8.2
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+More details in:
+http://gcc.1065356.n5.nabble.com/PATCH-ARM-Fix-unrecognizable-vector-comparisons-td947064.html
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@201620 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog                            |  8 ++++++++
+ gcc/config/arm/neon.md                   | 34 +++++++++++++++++++++++++++-----
+ gcc/testsuite/ChangeLog                  |  7 +++++++
+ gcc/testsuite/gcc.target/arm/lp1189445.c | 18 +++++++++++++++++
+ 4 files changed, 62 insertions(+), 5 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/arm/lp1189445.c
+
+diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md
+index d8d4202..86a5932 100644
+--- a/gcc/config/arm/neon.md
++++ b/gcc/config/arm/neon.md
+@@ -1732,6 +1732,7 @@
+ 			     ? 3 : 1;
+   rtx magic_rtx = GEN_INT (magic_word);
+   int inverse = 0;
++  int use_zero_form = 0;
+   int swap_bsl_operands = 0;
+   rtx mask = gen_reg_rtx (<V_cmp_result>mode);
+   rtx tmp = gen_reg_rtx (<V_cmp_result>mode);
+@@ -1742,12 +1743,16 @@
+   switch (GET_CODE (operands[3]))
+     {
+     case GE:
++    case GT:
+     case LE:
++    case LT:
+     case EQ:
+-      if (!REG_P (operands[5])
+-	  && (operands[5] != CONST0_RTX (<MODE>mode)))
+-	operands[5] = force_reg (<MODE>mode, operands[5]);
+-      break;
++      if (operands[5] == CONST0_RTX (<MODE>mode))
++	{
++	  use_zero_form = 1;
++	  break;
++	}
++      /* Fall through.  */
+     default:
+       if (!REG_P (operands[5]))
+ 	operands[5] = force_reg (<MODE>mode, operands[5]);
+@@ -1798,7 +1803,26 @@
+ 	 a GT b -> a GT b
+ 	 a LE b -> b GE a
+ 	 a LT b -> b GT a
+-	 a EQ b -> a EQ b  */
++	 a EQ b -> a EQ b
++	 Note that there also exist direct comparison against 0 forms,
++	 so catch those as a special case.  */
++      if (use_zero_form)
++	{
++	  inverse = 0;
++	  switch (GET_CODE (operands[3]))
++	    {
++	    case LT:
++	      base_comparison = gen_neon_vclt<mode>;
++	      break;
++	    case LE:
++	      base_comparison = gen_neon_vcle<mode>;
++	      break;
++	    default:
++	      /* Do nothing, other zero form cases already have the correct
++		 base_comparison.  */
++	      break;
++	    }
++	}
+ 
+       if (!inverse)
+ 	emit_insn (base_comparison (mask, operands[4], operands[5], magic_rtx));
+diff --git a/gcc/testsuite/gcc.target/arm/lp1189445.c b/gcc/testsuite/gcc.target/arm/lp1189445.c
+new file mode 100644
+index 0000000..766748e
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/arm/lp1189445.c
+@@ -0,0 +1,18 @@
++/* { dg-do compile } */
++/* { dg-require-effective-target arm_neon } */
++/* { dg-add-options arm_neon } */
++/* { dg-options "-O3" } */
++
++int id;
++int
++test (const long int *data)
++{
++  int i, retval;
++  retval = id;
++  for (i = 0; i < id; i++)
++    {
++      retval &= (data[i] <= 0);
++    }
++
++  return (retval);
++}
+-- 
+2.0.0
+