[backport from gcc-4.7/trunk <mikpe@it.uu.se>]

gcc/

2011-03-30  Richard Sandiford  <richard.sandiford@linaro.org>

	PR target/47551
	* config/arm/arm.c (coproc_secondary_reload_class): Handle
	structure modes.  Don't check neon_vector_mem_operand for
	vector or structure modes.

gcc/testsuite/

2011-03-30  Richard Sandiford  <richard.sandiford@linaro.org>

	PR target/47551
	* gcc.target/arm/neon-modes-2.c: New test.

--- gcc-4.6.0/gcc/config/arm/arm.c.~1~	2011-01-29 04:20:57.000000000 +0100
+++ gcc-4.6.0/gcc/config/arm/arm.c	2011-05-14 15:14:30.000000000 +0200
@@ -9139,11 +9139,14 @@ coproc_secondary_reload_class (enum mach
       return GENERAL_REGS;
     }
 
+  /* The neon move patterns handle all legitimate vector and struct
+     addresses.  */
   if (TARGET_NEON
+      && MEM_P (x)
       && (GET_MODE_CLASS (mode) == MODE_VECTOR_INT
-          || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT)
-      && neon_vector_mem_operand (x, 0))
-     return NO_REGS;
+	  || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT
+	  || VALID_NEON_STRUCT_MODE (mode)))
+    return NO_REGS;
 
   if (arm_coproc_mem_operand (x, wb) || s_register_operand (x, mode))
     return NO_REGS;
--- gcc-4.6.0/gcc/testsuite/gcc.target/arm/neon-modes-2.c.~1~	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.6.0/gcc/testsuite/gcc.target/arm/neon-modes-2.c	2011-05-14 15:14:30.000000000 +0200
@@ -0,0 +1,24 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target arm_neon_ok } */
+/* { dg-options "-O1" } */
+/* { dg-add-options arm_neon } */
+
+#include "arm_neon.h"
+
+#define SETUP(A) x##A = vld3_u32 (ptr + A * 0x20)
+#define MODIFY(A) x##A = vld3_lane_u32 (ptr + A * 0x20 + 0x10, x##A, 1)
+#define STORE(A) vst3_u32 (ptr + A * 0x20, x##A)
+
+#define MANY(A) A (0), A (1), A (2), A (3), A (4), A (5)
+
+void
+bar (uint32_t *ptr, int y)
+{
+  uint32x2x3_t MANY (SETUP);
+  int *x = __builtin_alloca (y);
+  int z[0x1000];
+  foo (x, z);
+  MANY (MODIFY);
+  foo (x, z);
+  MANY (STORE);
+}