On 13/07/15 10:31, Thomas Schwinge wrote:
Hi Tom!
On Mon, 13 Jul 2015 09:20:16 +0200, Tom de Vries<tom_devr...@mentor.com> wrote:
>On 12/07/15 11:39, Thomas Schwinge wrote:
> >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.
(Well, it was, but not "substantially".) You'd ported all your trunk
commits to gomp-4_0-branch already (thanks!), and in the functions where
I got merge conflicts, I just retained the code that was present on
gomp-4_0-branch already, which apparently was the right thing to do.;-)
Hmm, the reason why I said tree-parloops.c was not modified, was that
the git show of your merge commit (which invokes git diff-tree --cc)
does not show any differences for tree-parloops.c:
...
$ git show 2c88b76c6bb1e01ab541ea7b02a2f097c888dcb1 | grep tree-parloops.c
$
...
OTOH, if I use --numstat as diff-tree argument, I see:
...
$ git diff-tree --numstat --cc 2c88b76c6bb1e01ab541ea7b02a2f097c888dcb1
| grep tree-parloops.c
7 34 gcc/tree-parloops.c
...
I'm not sure if this is expected behaviour.
Thanks,
- Tom
