procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
From-SVN: r43373
This commit is contained in:
Jan Hubicka 2001-06-14 15:41:22 +02:00 • committed by Jan Hubicka
parent 3ea099f179
commit e323735cb2
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/ChangeLog
View file

@ -1,3 +1,7 @@
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>
* doc/c-tree.texi, doc/contrib.texi, doc/extend.texi,

4
gcc/config/i386/i386.c
View file

@ -2536,11 +2536,11 @@ ix86_expand_prologue ()
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
(stack_pointer_rtx, stack_pointer_rtx,
GEN_INT (-frame.to_allocate)));
GEN_INT (-allocate)));
RTX_FRAME_RELATED_P (insn) = 1;
}
else