Skip to contentSkip to conversation

Fix for beagleboard ICE when building lttng-ust

PATCH In review Saul Wold 2 participants 3 messages Sep 7, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Fix for beagleboard ICE when building lttng-ust

The following changes since commit 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f:

icu-3.6: fix building with big make -j (2011-09-05 20:38:50 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/gcc-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/gcc-fix

Saul Wold (1):
gcc: add patch for ice 50099, which caused lttng-ust not to build

 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
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/1 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 <[email protected]>
Signed-off-by Saul Wold <[email protected]>
---
 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
meta/recipes-devtools/gcc/gcc-4.6.inc +2 -1
index 380f9f7..f7bcf30 100644
@@ -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 "
meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch new file +38 -0
new file mode 100644
index 0000000..4b9f70d
@@ -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]);
+
Signature · 1 line
1.7.6
#2 lore raw

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

Op 7 sep 2011, om 07:03 heeft Saul Wold het volgende geschreven:

Quoted 40 lines

[YOCTO #1381]

This patch came from from GCC Bugzilla via Khem

Cc Khem Raj <[email protected]>
Signed-off-by Saul Wold <[email protected]>

---
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

meta/recipes-devtools/gcc/gcc-4.6.inc +0 -0
index 380f9f7..f7bcf30 100644
@@ -1,6 +1,6 @@

require gcc-common.inc

meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
-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
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -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 "

meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch new file +0 -0
new file mode 100644
index 0000000..4b9f70d

meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch line 4

Quoted 4 lines
meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch new file +4 -0
@@ -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?