Patchwork [1/1] gcc: add patch for ice 50099, which caused lttng-ust not to build

login
register
mail settings
Submitter Saul Wold
Date Sept. 7, 2011, 5:03 a.m.
Message ID <82477f26f43776abf9e74c026cf8f8984160a172.1315371674.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/11121/
State New, archived
Headers show

Comments

Saul Wold - Sept. 7, 2011, 5:03 a.m.
[YOCTO #1381]

This patch came from from GCC Bugzilla via Khem

Cc: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/gcc/gcc-4.6.inc              |    3 +-
 .../gcc/gcc-4.6/fix-for-ice-50099.patch            |   38 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
Koen Kooi - Sept. 7, 2011, 7:24 a.m.
Op 7 sep 2011, om 07:03 heeft Saul Wold het volgende geschreven:

> [YOCTO #1381]
>
> This patch came from from GCC Bugzilla via Khem
>
> Cc: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-devtools/gcc/gcc-4.6.inc              |    3 +-
> .../gcc/gcc-4.6/fix-for-ice-50099.patch            |   38 +++++++++++ 
> +++++++++
> 2 files changed, 40 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for- 
> ice-50099.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes- 
> devtools/gcc/gcc-4.6.inc
> index 380f9f7..f7bcf30 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.6.inc
> +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
> @@ -1,6 +1,6 @@
> require gcc-common.inc
>
> -PR = "r9"
> +PR = "r10"
>
> # Third digit in PV should be incremented after a minor release
> # happens from this branch on gcc e.g. currently its 4.6.0
> @@ -67,6 +67,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/ 
> branches;module=${BRANCH};proto=http \
>            file://volatile_access_backport.patch \
>            file://use-defaults.h-and-t-oe-in-B.patch \
> 	   file://powerpc-e5500.patch \
> +           file://fix-for-ice-50099.patch \
> 	  "
>
> SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
> diff --git a/meta/recipes-devtools/gcc/gcc-4.6/fix-for- 
> ice-50099.patch b/meta/recipes-devtools/gcc/gcc-4.6/fix-for- 
> ice-50099.patch
> new file mode 100644
> index 0000000..4b9f70d
> --- /dev/null
> +++ b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
> @@ -0,0 +1,38 @@
> +Index: gcc/config/arm/arm.md
> +===================================================================
> +--- gcc-4.6.0/gcc/config/arm/arm.md	(revision 178135)
> ++++ gcc-4.6.0/gcc/config/arm/arm.md	(working copy)

Where's the patch header for this patch with e.g. upstream status?

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 380f9f7..f7bcf30 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@ 
 require gcc-common.inc
 
-PR = "r9"
+PR = "r10"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.6.0
@@ -67,6 +67,7 @@  SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
            file://volatile_access_backport.patch \
            file://use-defaults.h-and-t-oe-in-B.patch \
 	   file://powerpc-e5500.patch \
+           file://fix-for-ice-50099.patch \
 	  "
 
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
new file mode 100644
index 0000000..4b9f70d
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
@@ -0,0 +1,38 @@ 
+Index: gcc/config/arm/arm.md
+===================================================================
+--- gcc-4.6.0/gcc/config/arm/arm.md	(revision 178135)
++++ gcc-4.6.0/gcc/config/arm/arm.md	(working copy)
+@@ -4217,6 +4217,7 @@ (define_split
+   "TARGET_32BIT"
+   [(set (match_dup 0) (ashiftrt:SI (match_dup 1) (const_int 31)))]
+ {
++  rtx srcop = operands[1];
+   rtx lo_part = gen_lowpart (SImode, operands[0]);
+   enum machine_mode src_mode = GET_MODE (operands[1]);
+ 
+@@ -4224,14 +4225,21 @@ (define_split
+       && !reg_overlap_mentioned_p (operands[0], operands[1]))
+     emit_clobber (operands[0]);
+ 
++  if (TARGET_ARM && src_mode == QImode
++      && !arm_reg_or_extendqisi_mem_op (srcop, QImode))
++    {
++      rtx dest = gen_lowpart (QImode, lo_part);
++      emit_move_insn (dest, srcop);
++      srcop = dest;
++    }
+   if (!REG_P (lo_part) || src_mode != SImode
+-      || !rtx_equal_p (lo_part, operands[1]))
++      || !rtx_equal_p (lo_part, srcop))
+     {
+       if (src_mode == SImode)
+-        emit_move_insn (lo_part, operands[1]);
++        emit_move_insn (lo_part, srcop);
+       else
+         emit_insn (gen_rtx_SET (VOIDmode, lo_part,
+-				gen_rtx_SIGN_EXTEND (SImode, operands[1])));
++				gen_rtx_SIGN_EXTEND (SImode, srcop)));
+       operands[1] = lo_part;
+     }
+   operands[0] = gen_highpart (SImode, operands[0]);
+