[cfe-dev] moving the clang-omp merge along

[Jack Howarth]

     Andrey Bokhanko expressed interest in getting the clang-omp merge done
in time for the 3.5 release but wants guidance on the process. I suggested
starting with the creation a new clang-omp branch upstream rebased on clang
trunk  for generation of merge patch. Unfortunately merging the  current
changes from the clang-omp (based on clang 3.4) to a clang-omp (based on
clang trunk)  looks very difficult as selective patches have been committed
into clang trunk from clang-omp and don't appear to have been kept
synchronized with the current changes from upstream. Does anyone know if
these new files from previous commits out of clang-omp contain any local
changes which haven't been back ported to clang-omp? It would seem that
postponing this merge will just make the process harder as time goes on if
selective merges from clang-omp into clang trunk continue in the interim.
Hopefully the folks who did the original selective commits would help
detangle this mess.
           Jack
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-dev/attachments/20140528/53ad6d7e/attachment.html>