The patch I am committing that makes the RTL passes be sequenced with
the pass manager, will also move init_tree_optimization_passes to
passes.c from tree-optimize.c. It is advisable that, before doing the
next merge to mainline on a tree that touches tree-optimize.c, you do
a diff between your tree-optimize.c and version 2.117, to guide you later.
I do not know of branches except new-ra that are working heavily on RTL
passes, where the problem could be code moved from passes.c to the
various RTL passes files. Just in case, the patch was committed on top
of version 2.96.
Other conflicts could be caused by added include files or by adding code
to the bottom of the files implementing the RTL passes. These are not
as bad.
I am CCing Diego and Jan as maintainers of GOMP (right?) branch and
tree-profiling-branch. If you have problems, drop me a note.
Paolo