diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-09-07 10:19:34 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-07 22:54:17 +0100 |
| commit | 0efd5b3d114a23c6821183e0f6c0538bf25e97b7 (patch) | |
| tree | 5132281668c96572c1617f08fbc2977066918b03 /meta/recipes-devtools | |
| parent | 7283bb980ba257a1aac74a12400a2d262d1e345d (diff) | |
| download | ast2050-yocto-poky-0efd5b3d114a23c6821183e0f6c0538bf25e97b7.zip ast2050-yocto-poky-0efd5b3d114a23c6821183e0f6c0538bf25e97b7.tar.gz | |
gcc: add patch for ice 50099, which caused lttng-ust not to build
[YOCTO #1381]
This patch came from from GCC Bugzilla via Khem
Cc: Khem Raj <raj.khem@gmail.com>
(From OE-Core rev: 61dac2f6f68bc46d8f3f6f7a8757924f103c7c54)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch | 49 |
2 files changed, 51 insertions, 1 deletions
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..57b03d2 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch @@ -0,0 +1,49 @@ + +This patch address an issue with the compiler generating an ICE +during compliation of lttng-ust. + +http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50099 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <khem.raj@gmail.com> +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +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]); + |
