From patchwork Fri Apr 8 13:48:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 608023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qhLQq2Kzwz9t4T for ; Fri, 8 Apr 2016 23:48:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=AhyziyO1; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=HWzlv+sJfZ0+RKQGwEsPpGmhXHFY9SWy3rSV+5d1TQhm60IOj7C7B wKE5Y7S6/7Y2XbQexDYXsnKzc1HHKERiNECWCGPlaI971ybACZQDVJgtiSC2urQ3 dyFTvprB0ITJREyWCbl51+s6SNjh6gWtLwBau1CkK4GiMG6ebB6xZU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type:content-transfer-encoding; s=default; bh=zDZAmb45iXnDhxFV0p84Ac8zCy8=; b=AhyziyO1PoIfMFhT3WBVLzZ/6sq2 fJjOCJyKdwwRAGv4IZEcOLLUG0srPCvV3/BVFVzO0tKOazoPzlhnY2DwosivKV+S JX0lJDzRV9SNs1PBpJVagycdFRNh7fR4JZ2UTHgO8uhmhxTGiDK6Hcj2stdekCDn 9LfvHHUt92pUz0I= Received: (qmail 34134 invoked by alias); 8 Apr 2016 13:48:42 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 34117 invoked by uid 89); 8 Apr 2016 13:48:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=HX-detected-operating-system:Windows X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 08 Apr 2016 13:48:31 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51918) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1aoWls-0003F9-Vp for gcc-patches@gnu.org; Fri, 08 Apr 2016 09:48:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoWlp-0007TW-9x for gcc-patches@gnu.org; Fri, 08 Apr 2016 09:48:24 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:61715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoWlp-0007TM-0o for gcc-patches@gnu.org; Fri, 08 Apr 2016 09:48:21 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1aoWln-0007TP-4f from Thomas_Schwinge@mentor.com ; Fri, 08 Apr 2016 06:48:19 -0700 Received: from hertz.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Fri, 8 Apr 2016 14:48:17 +0100 From: Thomas Schwinge To: , Jakub Jelinek , Tom de Vries CC: Jeff Law Subject: Re: [patch, driver] Ignore -ftree-parallelize-loops={0,1} In-Reply-To: <20160408114349.GS19207@tucnak.redhat.com> References: <559B8565.6030806@mentor.com> <55A399D8.60300@mentor.com> <55A49620.9070501@redhat.com> <55A4CA09.5060107@mentor.com> <871t79t6lr.fsf@kepler.schwinge.homeip.net> <87d1q075h9.fsf@kepler.schwinge.homeip.net> <5707981E.40809@mentor.com> <20160408114349.GS19207@tucnak.redhat.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Fri, 8 Apr 2016 15:48:16 +0200 Message-ID: <87h9fc5hzz.fsf@hertz.schwinge.homeip.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi! On Fri, 8 Apr 2016 13:43:49 +0200, Jakub Jelinek wrote: > On Fri, Apr 08, 2016 at 01:38:06PM +0200, Tom de Vries wrote: > > On 08/04/16 12:35, Thomas Schwinge wrote: > > I've looked at the patch, it looks good to me. > > > > I think it can be committed as obvious. > > The patch is ok for trunk. Committed (without changes) in r234831: commit a5f0da96ac1554f56d064c5ae89a80833bd01888 Author: tschwinge Date: Fri Apr 8 13:47:37 2016 +0000 Complete changes to "Ignore -ftree-parallelize-loops={0,1} using gt" Apply the r225764 and r233573 changes to all relevant spec strings. gcc/ * config/arc/arc.h (LINK_COMMAND_SPEC): Use gt to ignore -ftree-parallelize-loops={0,1}. * config/darwin.h (LINK_COMMAND_SPEC_A): Likewise. * config/i386/mingw32.h (GOMP_SELF_SPECS): Likewise. * config/ia64/hpux.h (LIB_SPEC): Likewise. * config/pa/pa-hpux11.h (LIB_SPEC): Likewise. * config/pa/pa64-hpux.h (LIB_SPEC): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234831 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/arc/arc.h | 3 ++- gcc/config/darwin.h | 2 +- gcc/config/i386/mingw32.h | 2 +- gcc/config/ia64/hpux.h | 2 +- gcc/config/pa/pa-hpux11.h | 2 +- gcc/config/pa/pa64-hpux.h | 12 ++++++------ 7 files changed, 22 insertions(+), 11 deletions(-) Grüße Thomas diff --git gcc/ChangeLog gcc/ChangeLog index 8e2ddf1..15e3d22 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,13 @@ +2016-04-08 Thomas Schwinge + + * config/arc/arc.h (LINK_COMMAND_SPEC): Use gt to ignore + -ftree-parallelize-loops={0,1}. + * config/darwin.h (LINK_COMMAND_SPEC_A): Likewise. + * config/i386/mingw32.h (GOMP_SELF_SPECS): Likewise. + * config/ia64/hpux.h (LIB_SPEC): Likewise. + * config/pa/pa-hpux11.h (LIB_SPEC): Likewise. + * config/pa/pa64-hpux.h (LIB_SPEC): Likewise. + 2016-04-08 Maxim Ostapenko PR sanitizer/70541 diff --git gcc/config/arc/arc.h gcc/config/arc/arc.h index 21c049f..1c2a38d 100644 --- gcc/config/arc/arc.h +++ gcc/config/arc/arc.h @@ -188,7 +188,8 @@ along with GCC; see the file COPYING3. If not see %(linker) %l " LINK_PIE_SPEC "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\ %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\ %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\ - %{fopenacc|fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ + %:include(libgomp.spec)%(link_gomp)}\ %(mflib)\ %{fprofile-arcs|fprofile-generate|coverage:-lgcov}\ %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}\ diff --git gcc/config/darwin.h gcc/config/darwin.h index 9f686d3..c9981b8 100644 --- gcc/config/darwin.h +++ gcc/config/darwin.h @@ -177,7 +177,7 @@ extern GTY(()) int darwin_ms_struct; %{o*}%{!o:-o a.out} \ %{!nostdlib:%{!nostartfiles:%S}} \ %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} \ - %{fopenacc|fopenmp|ftree-parallelize-loops=*: \ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): \ %{static|static-libgcc|static-libstdc++|static-libgfortran: libgomp.a%s; : -lgomp } } \ %{fgnu-tm: \ %{static|static-libgcc|static-libstdc++|static-libgfortran: libitm.a%s; : -litm } } \ diff --git gcc/config/i386/mingw32.h gcc/config/i386/mingw32.h index 4ac5f68..e048189 100644 --- gcc/config/i386/mingw32.h +++ gcc/config/i386/mingw32.h @@ -207,7 +207,7 @@ do { \ /* mingw32 uses the -mthreads option to enable thread support. */ #undef GOMP_SELF_SPECS -#define GOMP_SELF_SPECS "%{fopenacc|fopenmp|ftree-parallelize-loops=*: " \ +#define GOMP_SELF_SPECS "%{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1): " \ "-mthreads -pthread}" #undef GTM_SELF_SPECS #define GTM_SELF_SPECS "%{fgnu-tm:-mthreads -pthread}" diff --git gcc/config/ia64/hpux.h gcc/config/ia64/hpux.h index 8b90c99..008c4f6 100644 --- gcc/config/ia64/hpux.h +++ gcc/config/ia64/hpux.h @@ -92,7 +92,7 @@ do { \ #undef LIB_SPEC #define LIB_SPEC \ "%{!shared: \ - %{mt|pthread:%{fopenacc|fopenmp|ftree-parallelize-loops=*:-lrt} -lpthread} \ + %{mt|pthread:%{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):-lrt} -lpthread} \ %{p:%{!mlp64:-L/usr/lib/hpux32/libp} \ %{mlp64:-L/usr/lib/hpux64/libp} -lprof} \ %{pg:%{!mlp64:-L/usr/lib/hpux32/libp} \ diff --git gcc/config/pa/pa-hpux11.h gcc/config/pa/pa-hpux11.h index 3e5207a..600b677 100644 --- gcc/config/pa/pa-hpux11.h +++ gcc/config/pa/pa-hpux11.h @@ -147,7 +147,7 @@ along with GCC; see the file COPYING3. If not see #undef LIB_SPEC #define LIB_SPEC \ "%{!shared:\ - %{fopenacc|fopenmp|ftree-parallelize-loops=*:\ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ %{static:-a archive_shared} -lrt %{static:-a archive}}\ %{mt|pthread:-lpthread} -lc\ %{static:%{!nolibdld:-a archive_shared -ldld -a archive -lc}\ diff --git gcc/config/pa/pa64-hpux.h gcc/config/pa/pa64-hpux.h index a5ccb4a..279406a 100644 --- gcc/config/pa/pa64-hpux.h +++ gcc/config/pa/pa64-hpux.h @@ -58,21 +58,21 @@ along with GCC; see the file COPYING3. If not see #if ((TARGET_DEFAULT | TARGET_CPU_DEFAULT) & MASK_GNU_LD) #define LIB_SPEC \ "%{!shared:\ - %{!p:%{!pg:%{fopenacc|fopenmp|ftree-parallelize-loops=*:\ + %{!p:%{!pg:%{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ %{static:-a shared} -lrt %{static:-a archive}}\ %{mt|pthread:-lpthread} -lc\ %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\ %{!mt:%{!pthread:-a shared -lc -a archive}}}}}\ %{p:%{!pg:%{static:%{!mhp-ld:-a shared}%{mhp-ld:-a archive_shared}}\ -lprof %{static:-a archive}\ - %{fopenacc|fopenmp|ftree-parallelize-loops=*:\ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ %{static:-a shared} -lrt %{static:-a archive}}\ %{mt|pthread:-lpthread} -lc\ %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\ %{!mt:%{!pthread:-a shared -lc -a archive}}}}}\ %{pg:%{static:%{!mhp-ld:-a shared}%{mhp-ld:-a archive_shared}}\ -lgprof %{static:-a archive}\ - %{fopenacc|fopenmp|ftree-parallelize-loops=*:\ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ %{static:-a shared} -lrt %{static:-a archive}}\ %{mt|pthread:-lpthread} -lc\ %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\ @@ -81,21 +81,21 @@ along with GCC; see the file COPYING3. If not see #else #define LIB_SPEC \ "%{!shared:\ - %{!p:%{!pg:%{fopenacc|fopenmp|ftree-parallelize-loops=*:\ + %{!p:%{!pg:%{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ %{static:-a shared} -lrt %{static:-a archive}}\ %{mt|pthread:-lpthread} -lc\ %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\ %{!mt:%{!pthread:-a shared -lc -a archive}}}}}\ %{p:%{!pg:%{static:%{mgnu-ld:-a shared}%{!mgnu-ld:-a archive_shared}}\ -lprof %{static:-a archive}\ - %{fopenacc|fopenmp|ftree-parallelize-loops=*:\ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ %{static:-a shared} -lrt %{static:-a archive}}\ %{mt|pthread:-lpthread} -lc\ %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\ %{!mt:%{!pthread:-a shared -lc -a archive}}}}}\ %{pg:%{static:%{mgnu-ld:-a shared}%{!mgnu-ld:-a archive_shared}}\ -lgprof %{static:-a archive}\ - %{fopenacc|fopenmp|ftree-parallelize-loops=*:\ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ %{static:-a shared} -lrt %{static:-a archive}}\ %{mt|pthread:-lpthread} -lc\ %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\