Index: gcc/config/arm/neon.md
===================================================================
--- gcc/config/arm/neon.md	(revision 174266)
+++ gcc/config/arm/neon.md	(working copy)
@@ -801,15 +801,40 @@
   [(set_attr "neon_type" "neon_int_1")]
 )
 
-(define_insn "orndi3_neon"
+;; TODO: investigate whether we should disable 
+;; this and bicdi3_neon for the A8 in line with the other
+;; changes above.
+(define_insn_and_split "orndi3_neon"
   [(set (match_operand:DI 0 "s_register_operand" "=w,?=&r,?&r")
 	(ior:DI (not:DI (match_operand:DI 2 "s_register_operand" "w,0,r"))
 		(match_operand:DI 1 "s_register_operand" "w,r,0")))]
   "TARGET_NEON"
   "@
-   vorn\t%P0, %P1, %P2
-   #
-   #"
+  vorn\t%P0, %P1, %P2
+  #
+  #"
+  "reload_completed && 
+  (TARGET_NEON && ! (IS_VFP_REGNUM (REGNO (operands[0]))))"
+  [(set (match_dup 0) (ior:SI (not:SI (match_dup 2)) (match_dup 1)))
+   (set (match_dup 3) (ior:SI (not:SI (match_dup 4)) (match_dup 5)))]
+  "
+  {
+    if (TARGET_THUMB2)
+      {
+       operands[3] = gen_highpart (SImode, operands[0]);
+       operands[0] = gen_lowpart (SImode, operands[0]);
+       operands[4] = gen_highpart (SImode, operands[2]);
+       operands[2] = gen_lowpart (SImode, operands[2]);
+       operands[5] = gen_highpart (SImode, operands[1]);
+       operands[1] = gen_lowpart (SImode, operands[1]);
+      }
+    else
+     {
+        emit_insn (gen_one_cmpldi2 (operands[0], operands[2]));
+        emit_insn (gen_iordi3 (operands[0], operands[1], operands[0]));
+        DONE;
+     }
+  }"
   [(set_attr "neon_type" "neon_int_1,*,*")
    (set_attr "length" "*,8,8")]
 )