Merge lp:~uweigand/gcc-linaro/lp-693425 into lp:gcc-linaro/4.5

[Ulrich Weigand]

Fix LP #693425.

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2010-12-14 14:39:51 +0000
+++ ChangeLog.linaro	2010-12-22 15:34:03 +0000
@@ -1,3 +1,14 @@
[phone]  Ulrich Weigand  <[e-mail]>
+
+	LP: #693425
+	Backport from mainline:
+
+	gcc/
+	* config/spu/spu.md ("mov<mode>"): Use nonimmediate_operand
+	predicate for destination operand.
+	* config/spu/spu.c (spu_expand_mov): If move destination is an
+	invalid subreg, perform move in the subreg's inner mode instead.
+
 2010-12-14  Andrew Stubbs  <[e-mail]>
 
 	gcc/

=== modified file 'gcc/config/spu/spu.c'
--- gcc/config/spu/spu.c	2010-08-04 09:53:04 +0000
+++ gcc/config/spu/spu.c	2010-12-22 15:34:03 +0000
@@ -4572,7 +4572,13 @@
 spu_expand_mov (rtx * ops, enum machine_mode mode)
 {
   if (GET_CODE (ops[0]) == SUBREG && !valid_subreg (ops[0]))
-    abort ();
+    {
+      /* Perform the move in the destination SUBREG's inner mode.  */
+      ops[0] = SUBREG_REG (ops[0]);
+      mode = GET_MODE (ops[0]);
+      ops[1] = gen_lowpart_common (mode, ops[1]);
+      gcc_assert (ops[1]);
+    }
 
   if (GET_CODE (ops[1]) == SUBREG && !valid_subreg (ops[1]))
     {

=== modified file 'gcc/config/spu/spu.md'
--- gcc/config/spu/spu.md	2009-05-23 01:28:14 +0000
+++ gcc/config/spu/spu.md	2010-12-22 15:34:03 +0000
@@ -269,8 +269,8 @@
 ;; mov
 
 (define_expand "mov<mode>"
-  [(set (match_operand:ALL 0 "spu_nonimm_operand" "=r,r,r,m")
-	(match_operand:ALL 1 "general_operand" "r,i,m,r"))]
+  [(set (match_operand:ALL 0 "nonimmediate_operand" "")
+	(match_operand:ALL 1 "general_operand" ""))]
   ""
   {
     if (spu_expand_mov(operands, <MODE>mode))