This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: Merge trunk r225562 (2015-07-08) into gomp-4_0-branch

From: Nathan Sidwell <nathan_sidwell at mentor dot com>
To: Thomas Schwinge <thomas at codesourcery dot com>, <gcc-patches at gcc dot gnu dot org>
Cc: "Rech, Alex" <alex_rech at mentor dot com>, Tom de Vries <vries at codesourcery dot com>
Date: Mon, 13 Jul 2015 09:21:42 -0400
Subject: Re: Merge trunk r225562 (2015-07-08) into gomp-4_0-branch
Authentication-results: sourceware.org; auth=none
References: <55A04C2C dot 1060709 at mentor dot com> <87lhel4sve dot fsf at schwinge dot name>

On 07/12/15 05:39, Thomas Schwinge wrote:

Hi!

On Fri, 10 Jul 2015 18:50:20 -0400, Nathan Sidwell <nathan_sidwell@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), gcc/tree-ssa-loop-ch.c
(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:


thanks!


--
Nathan Sidwell - Director, Sourcery Services - Mentor Embedded

References:
- Merge trunk r225562 (2015-07-08) into gomp-4_0-branch (was: gomp4 merge)
  - From: Thomas Schwinge

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]