summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-11-20 17:50:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-21 16:55:12 (GMT)
commit7022a8f8045bdf82b9209b8cd62fb09c4a7a24f8 (patch)
tree90b9d6345748873f6d89cbbe2e2321009108d803 /meta/recipes-devtools/gcc
parent9320b76a97aeb2efe7195f438c9f44aae6e2d81d (diff)
downloadpoky-7022a8f8045bdf82b9209b8cd62fb09c4a7a24f8.tar.gz
gcc-4.6: Fix gcc ICE on qt4-x11-free/armv7-a
Backport fix for PR 47551 fixes the ICE seen on armv7-a/qt4-x11-free Bump up SRCREV past gcc 4.6.2 release (From OE-Core rev: dd2fdf9f5a3923c37e4ea2e46e347bb0657c2f5b) 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.inc9
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch63
2 files changed, 68 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 469457c..7bf14e3 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
1require gcc-common.inc 1require gcc-common.inc
2 2
3PR = "r16" 3PR = "r17"
4 4
5# Third digit in PV should be incremented after a minor release 5# Third digit in PV should be incremented after a minor release
6# happens from this branch on gcc e.g. currently its 4.6.0 6# happens from this branch on gcc e.g. currently its 4.6.0
@@ -8,7 +8,7 @@ PR = "r16"
8# on branch then PV should be incremented to 4.6.1+svnr${SRCPV} 8# on branch then PV should be incremented to 4.6.1+svnr${SRCPV}
9# to reflect that change 9# to reflect that change
10 10
11PV = "4.6.1+svnr${SRCPV}" 11PV = "4.6.2+svnr${SRCPV}"
12 12
13# BINV should be incremented after updating to a revision 13# BINV should be incremented after updating to a revision
14# after a minor gcc release (e.g. 4.6.1 or 4.6.2) has been made 14# after a minor gcc release (e.g. 4.6.1 or 4.6.2) has been made
@@ -16,9 +16,9 @@ PV = "4.6.1+svnr${SRCPV}"
16# 4.6.1 then the value below will have 2 which will mean 4.6.2 16# 4.6.1 then the value below will have 2 which will mean 4.6.2
17# which will be next minor release and so on. 17# which will be next minor release and so on.
18 18
19BINV = "4.6.2" 19BINV = "4.6.3"
20 20
21SRCREV = 180099 21SRCREV = 181430
22BRANCH = "gcc-4_6-branch" 22BRANCH = "gcc-4_6-branch"
23FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}" 23FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}"
24 24
@@ -71,6 +71,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
71 file://gcc-with-linker-hash-style.patch \ 71 file://gcc-with-linker-hash-style.patch \
72 file://pr46934.patch \ 72 file://pr46934.patch \
73 file://pr32219.patch \ 73 file://pr32219.patch \
74 file://pr47551.patch \
74 " 75 "
75 76
76SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch " 77SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch b/meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch
new file mode 100644
index 0000000..5271ffa
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch
@@ -0,0 +1,63 @@
12011-02-02 Richard Sandiford <richard.sandiford@linaro.org>
2
3 gcc/
4 PR target/47551
5 * config/arm/arm.c (coproc_secondary_reload_class): Handle
6 structure modes. Don't check neon_vector_mem_operand for
7 vector or structure modes.
8
9 gcc/testsuite/
10 PR target/47551
11 * gcc.target/arm/neon-modes-2.c: New test.
12
13=== modified file 'gcc/config/arm/arm.c'
14--- old/gcc/config/arm/arm.c 2011-02-21 14:04:51 +0000
15+++ new/gcc/config/arm/arm.c 2011-03-02 11:38:43 +0000
16@@ -9139,11 +9139,14 @@
17 return GENERAL_REGS;
18 }
19
20+ /* The neon move patterns handle all legitimate vector and struct
21+ addresses. */
22 if (TARGET_NEON
23+ && MEM_P (x)
24 && (GET_MODE_CLASS (mode) == MODE_VECTOR_INT
25- || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT)
26- && neon_vector_mem_operand (x, 0))
27- return NO_REGS;
28+ || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT
29+ || VALID_NEON_STRUCT_MODE (mode)))
30+ return NO_REGS;
31
32 if (arm_coproc_mem_operand (x, wb) || s_register_operand (x, mode))
33 return NO_REGS;
34
35=== added file 'gcc/testsuite/gcc.target/arm/neon-modes-2.c'
36--- old/gcc/testsuite/gcc.target/arm/neon-modes-2.c 1970-01-01 00:00:00 +0000
37+++ new/gcc/testsuite/gcc.target/arm/neon-modes-2.c 2011-02-02 10:02:45 +0000
38@@ -0,0 +1,24 @@
39+/* { dg-do compile } */
40+/* { dg-require-effective-target arm_neon_ok } */
41+/* { dg-options "-O1" } */
42+/* { dg-add-options arm_neon } */
43+
44+#include "arm_neon.h"
45+
46+#define SETUP(A) x##A = vld3_u32 (ptr + A * 0x20)
47+#define MODIFY(A) x##A = vld3_lane_u32 (ptr + A * 0x20 + 0x10, x##A, 1)
48+#define STORE(A) vst3_u32 (ptr + A * 0x20, x##A)
49+
50+#define MANY(A) A (0), A (1), A (2), A (3), A (4), A (5)
51+
52+void
53+bar (uint32_t *ptr, int y)
54+{
55+ uint32x2x3_t MANY (SETUP);
56+ int *x = __builtin_alloca (y);
57+ int z[0x1000];
58+ foo (x, z);
59+ MANY (MODIFY);
60+ foo (x, z);
61+ MANY (STORE);
62+}
63