56d343
2018-04-10  Segher Boessenkool  <segher@kernel.crashing.org>
56d343
56d343
        PR target/85287
56d343
        * gcc/config/rs6000/rs6000.md (allocate_stack): Put the residual size
56d343
        for stack clash protection in a register whenever we need it to be in
56d343
        a register.
56d343
56d343
56d343
--- a/gcc/config/rs6000/rs6000.md	2018/04/10 21:09:30	259298
56d343
+++ b/gcc/config/rs6000/rs6000.md	2018/04/10 21:37:34	259299
56d343
@@ -9783,14 +9783,12 @@
56d343
       /* Now handle residuals.  We just have to set operands[1] correctly
56d343
 	 and let the rest of the expander run.  */
56d343
       operands[1] = residual;
56d343
-      if (!CONST_INT_P (residual))
56d343
-	operands[1] = force_reg (Pmode, operands[1]);
56d343
     }
56d343
 
56d343
-  if (GET_CODE (operands[1]) != CONST_INT
56d343
-      || INTVAL (operands[1]) < -32767
56d343
-      || INTVAL (operands[1]) > 32768)
56d343
+  if (!(CONST_INT_P (operands[1])
56d343
+	&& IN_RANGE (INTVAL (operands[1]), -32767, 32768)))
56d343
     {
56d343
+      operands[1] = force_reg (Pmode, operands[1]);
56d343
       neg_op0 = gen_reg_rtx (Pmode);
56d343
       if (TARGET_32BIT)
56d343
 	emit_insn (gen_negsi2 (neg_op0, operands[1]));
56d343
@@ -9798,7 +9796,7 @@
56d343
 	emit_insn (gen_negdi2 (neg_op0, operands[1]));
56d343
     }
56d343
   else
56d343
-    neg_op0 = GEN_INT (- INTVAL (operands[1]));
56d343
+    neg_op0 = GEN_INT (-INTVAL (operands[1]));
56d343
 
56d343
   insn = emit_insn ((* ((TARGET_32BIT) ? gen_movsi_update_stack
56d343
 				       : gen_movdi_di_update_stack))
56d343