egcs/gcc cfglayout.c cfgrtl.c haifa-sched.c

[hubicka@gcc.gnu.org]

CVSROOT:	/cvs/gcc
Module name:	egcs
Branch: 	cfg-branch
Changes by:	hubicka@gcc.gnu.org	2001-12-29 12:46:45

Modified files:
	gcc            : cfglayout.c cfgrtl.c haifa-sched.c 

Log message:
	Fix merger problems.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/egcs/gcc/cfglayout.c.diff?cvsroot=gcc&only_with_tag=cfg-branch&r1=1.2.2.20&r2=1.2.2.21
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/egcs/gcc/cfgrtl.c.diff?cvsroot=gcc&only_with_tag=cfg-branch&r1=1.10.2.8&r2=1.10.2.9
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/egcs/gcc/haifa-sched.c.diff?cvsroot=gcc&only_with_tag=cfg-branch&r1=1.190.2.1&r2=1.190.2.2