Message ID | yddwpngvb6x.fsf@lokon.CeBiTec.Uni-Bielefeld.DE |
---|---|
State | New |
Headers | show |
On Apr 29, 2016, at 5:41 AM, Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> wrote: > diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h > --- a/gcc/config/darwin.h > +++ b/gcc/config/darwin.h > @@ -179,6 +179,7 @@ extern GTY(()) int darwin_ms_struct; > %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \ > %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): \ > %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \ > + %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ > %{fgnu-tm: \ > %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \ > %{!nostdlib:%{!nodefaultlibs:\ Ok.
On Apr 29, 2016, at 5:41 AM, Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> wrote: > diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h > --- a/gcc/config/darwin.h > +++ b/gcc/config/darwin.h > @@ -179,6 +179,7 @@ extern GTY(()) int darwin_ms_struct; > %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \ > %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): \ > %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \ > + %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ > %{fgnu-tm: \ > %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \ > %{!nostdlib:%{!nodefaultlibs:\ Ok.
On Fri, Apr 29, 2016 at 11:19:47 -0700, Mike Stump wrote: > On Apr 29, 2016, at 5:41 AM, Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> wrote: > > diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h > > --- a/gcc/config/darwin.h > > +++ b/gcc/config/darwin.h > > @@ -179,6 +179,7 @@ extern GTY(()) int darwin_ms_struct; > > %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \ > > %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): \ > > %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \ > > + %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ > > %{fgnu-tm: \ > > %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \ > > %{!nostdlib:%{!nodefaultlibs:\ > > Ok. Is it OK to backport this patch to gcc-6-branch? I've re-tested it on macOS with gcc 6. -- Ilya
On 06/14/2016 12:09 PM, Ilya Verbin wrote: > On Fri, Apr 29, 2016 at 11:19:47 -0700, Mike Stump wrote: >> On Apr 29, 2016, at 5:41 AM, Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> wrote: >>> diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h >>> --- a/gcc/config/darwin.h >>> +++ b/gcc/config/darwin.h >>> @@ -179,6 +179,7 @@ extern GTY(()) int darwin_ms_struct; >>> %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \ >>> %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): \ >>> %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \ >>> + %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ >>> %{fgnu-tm: \ >>> %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \ >>> %{!nostdlib:%{!nodefaultlibs:\ >> >> Ok. > > Is it OK to backport this patch to gcc-6-branch? > I've re-tested it on macOS with gcc 6. Yes. This is fine. jeff
On Jun 14, 2016, at 11:09 AM, Ilya Verbin <iverbin@gmail.com> wrote: > > On Fri, Apr 29, 2016 at 11:19:47 -0700, Mike Stump wrote: >> On Apr 29, 2016, at 5:41 AM, Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> wrote: >>> diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h >>> --- a/gcc/config/darwin.h >>> +++ b/gcc/config/darwin.h >>> @@ -179,6 +179,7 @@ extern GTY(()) int darwin_ms_struct; >>> %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \ >>> %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): \ >>> %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \ >>> + %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ >>> %{fgnu-tm: \ >>> %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \ >>> %{!nostdlib:%{!nodefaultlibs:\ >> >> Ok. > > Is it OK to backport this patch to gcc-6-branch? Ok.
# HG changeset patch # Parent 297a270669c098610ed0f7333b9a11ab4d3ef2bd Handle -fcilkplus in Mac OS X LINK_COMMAND_SPEC diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -179,6 +179,7 @@ extern GTY(()) int darwin_ms_struct; %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \ %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): \ %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \ + %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ %{fgnu-tm: \ %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \ %{!nostdlib:%{!nodefaultlibs:\