diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed6f28e1db1..14efd7a35b0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-14  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR target/68865
+	PR target/68879
+	* config/rs6000/rs6000.md (cstore_si_as_di): Force all operands
+	into registers.
+
 2015-12-14  Richard Biener  <rguenther@suse.de>
 
 	Revert accidentially applied
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 66a62ef4186..35685a92e1a 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -10631,6 +10631,8 @@
   int uns_flag = unsigned_comparison_operator (operands[1], VOIDmode) ? 1 : 0;
   enum rtx_code cond_code = signed_condition (GET_CODE (operands[1]));
 
+  operands[2] = force_reg (SImode, operands[2]);
+  operands[3] = force_reg (SImode, operands[3]);
   rtx op1 = gen_reg_rtx (DImode);
   rtx op2 = gen_reg_rtx (DImode);
   convert_move (op1, operands[2], uns_flag);