The test was failing on 3.9 on my Mac, and I noticed there were some follow-up commits, so I've merged r276983, r277138, r277141 in r277193.
On Thu, Jul 28, 2016 at 10:18 AM, Hans Wennborg <h...@chromium.org> wrote: > I've merged it in r277004. > > Cheers, > Hans > > On Thu, Jul 28, 2016 at 10:15 AM, Samuel F Antao <sfan...@us.ibm.com> wrote: >> Hi Hans, >> >> I think it should. All the stuff that enables this fix seems to be in 3.9 >> already. >> >> Thanks! >> Samuel >> >> >> >> ----- Original message ----- >> From: Hans Wennborg <h...@chromium.org> >> Sent by: hwennb...@google.com >> To: Samuel F Antao/Watson/IBM@IBMUS, "Bataev, Alexey" <a.bat...@hotmail.com> >> Cc: cfe-commits <cfe-commits@lists.llvm.org> >> Subject: Re: r276979 - [OpenMP][CUDA] Do not forward OpenMP flags for CUDA >> device actions. >> Date: Thu, Jul 28, 2016 1:10 PM >> >> Should we merge this to 3.9? >> >> Cheers, >> Hans >> >> On Thu, Jul 28, 2016 at 7:29 AM, Samuel Antao via cfe-commits >> <cfe-commits@lists.llvm.org> wrote: >>> Author: sfantao >>> Date: Thu Jul 28 09:29:18 2016 >>> New Revision: 276979 >>> >>> URL: http://llvm.org/viewvc/llvm-project?rev=276979&view=rev >>> Log: >>> [OpenMP][CUDA] Do not forward OpenMP flags for CUDA device actions. >>> >>> Summary: >>> This patch prevents OpenMP flags from being forwarded to CUDA device >>> commands. That was causing the CUDA frontend to attempt to emit OpenMP code >>> which is not supported. >>> >>> This fixes the bug reported in >>> https://llvm.org/bugs/show_bug.cgi?id=28723. >>> >>> Reviewers: hfinkel, carlo.bertolli, arpith-jacob, kkwli0, tra, ABataev >>> >>> Subscribers: caomhin, cfe-commits >>> >>> Differential Revision: https://reviews.llvm.org/D22895 >>> >>> Added: >>> cfe/trunk/test/Driver/offloading-interoperability.c >>> Modified: >>> cfe/trunk/lib/Driver/Tools.cpp >> >> >> >> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
