diff options
| author | Jan Hubicka <jh@suse.cz> | 2001-06-14 15:41:22 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2001-06-14 13:41:22 +0000 |
| commit | e323735cb29fa11ab24678c7218afdd6e3e9949d (patch) | |
| tree | a5fc53c77b7b603ffdd35897166bf4ceae71c600 | |
| parent | 3ea099f17999ab6114515989ef3bcbc5086dd1d0 (diff) | |
| download | gcc-e323735cb29fa11ab24678c7218afdd6e3e9949d.zip gcc-e323735cb29fa11ab24678c7218afdd6e3e9949d.tar.gz gcc-e323735cb29fa11ab24678c7218afdd6e3e9949d.tar.bz2 | |
* i386.c (ix86_expand_prologue): Fix merging conflict.
From-SVN: r43373
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 107f623..4d2efb3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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, diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index af765db..fb57394 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -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 |