summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-12-05 21:21:21 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-06 14:38:12 +0000
commit048c31c4e19d1bb060c79011cb25dfeff51c3ef1 (patch)
tree871f5e162bffdb9b71e2056939587a7266d78efb /meta/recipes-devtools/gcc
parent24442c5e03ed7aa12003a8310845c95bbd8ba224 (diff)
downloadopenembedded-core-048c31c4e19d1bb060c79011cb25dfeff51c3ef1.tar.gz
openembedded-core-048c31c4e19d1bb060c79011cb25dfeff51c3ef1.tar.bz2
openembedded-core-048c31c4e19d1bb060c79011cb25dfeff51c3ef1.tar.xz
openembedded-core-048c31c4e19d1bb060c79011cb25dfeff51c3ef1.zip
gcc: Backport patch from trunk to fix ICE seen on armv7 with mesa-xlib
This patch is a backport of http://patchwork.ozlabs.org/patch/110517/ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.inc3
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch34
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 7cd08500d..18e05363f 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 = "r18"
+PR = "r19"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -72,6 +72,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://pr46934.patch \
file://pr32219.patch \
file://pr47551.patch \
+ file://gcc-arm-set-cost.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
new file mode 100644
index 000000000..04dabaf60
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
@@ -0,0 +1,34 @@
+2011-08-18 Richard Sandiford <richard.sandiford@linaro.org>
+
+ gcc/
+ Backport from mainline:
+
+ 2011-08-18 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * config/arm/arm.c (arm_rtx_costs_1): Don't modify the costs of SET.
+ (arm_size_rtx_costs): Likewise.
+
+=== modified file 'gcc/config/arm/arm.c'
+--- old/gcc/config/arm/arm.c 2011-08-12 08:08:31 +0000
++++ new/gcc/config/arm/arm.c 2011-08-18 13:53:37 +0000
+@@ -7464,6 +7464,9 @@
+ *total = COSTS_N_INSNS (4);
+ return true;
+
++ case SET:
++ return false;
++
+ default:
+ *total = COSTS_N_INSNS (4);
+ return false;
+@@ -7811,6 +7814,9 @@
+ *total = COSTS_N_INSNS (1) + 1;
+ return true;
+
++ case SET:
++ return false;
++
+ default:
+ if (mode != VOIDmode)
+ *total = COSTS_N_INSNS (ARM_NUM_REGS (mode));
+