This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: GCC build failed for native with your patch on 2001-06-14T11:05:02Z.
- To: gcc-regression at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Subject: Re: GCC build failed for native with your patch on 2001-06-14T11:05:02Z.
- From: Jan Hubicka <jh at suse dot cz>
- Date: Thu, 14 Jun 2001 15:13:13 +0200
- Cc: jh at suse dot cz, nathan at codesourcery dot com
- References: <200106141253.f5ECrfn25101@maat.cygnus.com>
Caused by my commit, again :(
cvs update did resolved the merging between my and Richard's patch in
wrong way. The install script passed it, as it does i586 bootstrap that
wroks fine.
I am about to install this as obvious if testing suceeds and I really apologize
for the breakage.
Honza
Thu Jun 14 15:12:31 CEST 2001 Jan Hubicka <jh@suse.cz>
* i386.c (ix86_expand_prologue): Fix merging conflict.
Index: i386.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/i386/i386.c,v
retrieving revision 1.267
diff -c -3 -p -r1.267 i386.c
*** i386.c 2001/06/14 10:45:38 1.267
--- i386.c 2001/06/14 13:11:55
*************** ix86_expand_prologue ()
*** 2540,2546 ****
{
insn = emit_insn (gen_pro_epilogue_adjust_stack
(stack_pointer_rtx, stack_pointer_rtx,
! GEN_INT (-frame.to_allocate)));
RTX_FRAME_RELATED_P (insn) = 1;
}
else
--- 2540,2546 ----
{
insn = emit_insn (gen_pro_epilogue_adjust_stack
(stack_pointer_rtx, stack_pointer_rtx,
! GEN_INT (-allocate)));
RTX_FRAME_RELATED_P (insn) = 1;
}
else