egcs/gcc ChangeLog config/i386/i386.c

Thu Jun 14 06:41:00 GMT 2001

CVSROOT:	/cvs/gcc
Module name:	egcs
Changes by:	hubicka@gcc.gnu.org	2001-06-14 06:41:24

Modified files:
	gcc            : ChangeLog 
	gcc/config/i386: i386.c 

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

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/egcs/gcc/ChangeLog.diff?cvsroot=gcc&r1=1.10375&r2=1.10376
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/egcs/gcc/config/i386/i386.c.diff?cvsroot=gcc&r1=1.267&r2=1.268