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

From-SVN: r43373

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 107f623a8c5e7a52f115b41e8dadb56e9dc3d534..4d2efb3804c237f1a2d13971c74e1409b091560d 100644 (file)
--- 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 af765db8c80540df7c77ac63e0b154486f8c6201..fb57394ac93f2f9d912f718b5190c3d0161ce605 100644 (file)
--- 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