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