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

From-SVN: r43373

* i386.c (ix86_expand_prologue): Fix merging conflict.
From-SVN: r43373
e323735c · Jan Hubicka · Jan Hubicka · 3ea099f1 · e323735c · e323735c
Commit e323735c authored Jun 14, 2001 by Jan Hubicka Committed by Jan Hubicka Jun 14, 2001
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

gcc/ChangeLog
+4 -0

gcc/config/i386/i386.c
+2 -2

No files found.
--- a/gcc/ChangeLog
+++ b/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>

 	* doc/c-tree.texi, doc/contrib.texi, doc/extend.texi,

--- 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