Skip to content

R
riscv-gcc-1
Commit e323735c by Jan Hubicka Committed by Jan Hubicka
Options

* i386.c (ix86_expand_prologue): Fix merging conflict. 

From-SVN: r43373
parent 3ea099f1
Showing with 6 additions and 2 deletions
gcc/ChangeLog
Thu Jun 14 15:38:28 CEST 2001 Jan Hubicka <jh@suse.cz>
* i386.c (ix86_expand_prologue): Fix merging conflict.
2001-06-14 Joseph S. Myers <jsm28@cam.ac.uk> 2001-06-14 Joseph S. Myers <jsm28@cam.ac.uk>
* doc/c-tree.texi, doc/contrib.texi, doc/extend.texi, * doc/c-tree.texi, doc/contrib.texi, doc/extend.texi,
......
gcc/config/i386/i386.c
...@@ -2536,11 +2536,11 @@ ix86_expand_prologue () ...@@ -2536,11 +2536,11 @@ ix86_expand_prologue ()
if (allocate == 0) if (allocate == 0)
; ;
else if (! TARGET_STACK_PROBE || frame.to_allocate < CHECK_STACK_LIMIT) else if (! TARGET_STACK_PROBE || allocate < CHECK_STACK_LIMIT)
{ {
insn = emit_insn (gen_pro_epilogue_adjust_stack insn = emit_insn (gen_pro_epilogue_adjust_stack
(stack_pointer_rtx, stack_pointer_rtx, (stack_pointer_rtx, stack_pointer_rtx,
GEN_INT (-frame.to_allocate))); GEN_INT (-allocate)));
RTX_FRAME_RELATED_P (insn) = 1; RTX_FRAME_RELATED_P (insn) = 1;
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment