On 12/07/15 11:39, Thomas Schwinge wrote:
Hi!
On Fri, 10 Jul 2015 18:50:20 -0400, Nathan Sidwell <nathan_sidw...@mentor.com>
wrote:
it looks like the most recent merge from trunk to gomp4 was early May. I think
it is time for another one -- can you handle that?
Indeed :-) -- and, as it happens, resolving the "merge artifacts" is one
of the things I've been working on last week. I hope I got that all
right, in particular gcc/tree-parloops.c (Tom),
I've looked at the merge commit, gcc/tree-parloops.c was not modified.
gcc/tree-ssa-loop-ch.c (Tom),
That looks ok. I just wonder whether we could have derived
pass_ch_oacc_kernels from pass_ch instead of from ch_base, avoiding
duplicating the execute function, and have
pass_ch_oacc_kernels::process_loop_p call pass_ch::process_loop_p rather
than inline it.
Thanks,
- Tom
gcc/config/nvptx/nvptx.c (Nathan), and thereabouts. You may want
to diff the current gomp-4_0-branch files against trunk r225562 (merge
base) as well as again gomp-4_0-branch r225715 (before the merge) to
verify. Anyway, in the quiet of the weekend now committed to
gomp-4_0-branch in r225719:
r225719 | tschwinge | 2015-07-12 11:30:39 +0200 (Sun, 12 Jul 2015) | 2
lines
svn merge -r 222860:225562 svn+ssh://gcc.gnu.org/svn/gcc/trunk
Grüße,
Thomas
