r123661 - in /branches/dataflow-branch/gcc: bb-...

[zadeck@gcc.gnu.org]

Author: zadeck
Date: Sun Apr  8 16:45:41 2007
New Revision: 123661

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=123661
Log:
fixed more more conflicts from dannyb's last merge.

Modified:
    branches/dataflow-branch/gcc/bb-reorder.c
    branches/dataflow-branch/gcc/cfglayout.c
    branches/dataflow-branch/gcc/combine-stack-adj.c
    branches/dataflow-branch/gcc/df-problems.c
    branches/dataflow-branch/gcc/fwprop.c
    branches/dataflow-branch/gcc/passes.c
    branches/dataflow-branch/gcc/reg-stack.c
    branches/dataflow-branch/gcc/regmove.c
    branches/dataflow-branch/gcc/tracer.c