From patchwork Sat Jul 11 21:18:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 494037 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 C15381402A5 for ; Sun, 12 Jul 2015 07:19:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=B56GnyKe; 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; q=dns; s=default; b=jHUsXW6kaALuGlXb NBI4VNeCJMx7wvac6z388LBGilYye0Yg6TZNfq1hEef0IwXcNPbwiECKQpzJV0Jh Smv6/RmTdBsVb47LlXJzrKgF8tr1ADu7TZrAmLH2qXAEXBnYw1JNKpE1ew8cmDv1 tlwz7+6ReXugEjUzaHu75HOyjTE= 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; s=default; bh=keAiSQi+uwSBwL81+KtGns C51yU=; b=B56GnyKejl+L+e0MQ6DFDZPbkqGn4kNl6dHOYHoqNdSLXl1D+51z5Q y/N5j2lbjgtnh6vWvW/DUprwOpzkOChRQ+fKA40E6LRdOC2vY5UmpkSviwe0v1he 0cB5ODiysPK5k9lcX08ADJ7ERlh7l2/Ll+HEGO8zVCRGrpKGTRQFA= Received: (qmail 18575 invoked by alias); 11 Jul 2015 21:18:53 -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 18566 invoked by uid 89); 11 Jul 2015 21:18:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 11 Jul 2015 21:18:51 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZE2AY-00045I-Rn from Thomas_Schwinge@mentor.com ; Sat, 11 Jul 2015 14:18:47 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Sat, 11 Jul 2015 22:18:45 +0100 From: Thomas Schwinge To: Nathan Sidwell , GCC Patches CC: Jakub Jelinek Subject: [gomp4] Resolve bootstrap failure in expand_GOACC_FORK, expand_GOACC_JOIN (was: Move openacc vector& worker single handling to RTL) In-Reply-To: <559F10F2.9050102@acm.org> References: <5597120D.2080308@acm.org> <20150703231159.GP10247@tucnak.redhat.com> <559844EF.6010208@acm.org> <559AD85B.2050102@acm.org> <20150707095408.GD10247@tucnak.redhat.com> <559BDE68.9010302@acm.org> <20150707142229.GG10247@tucnak.redhat.com> <559D381C.7020804@acm.org> <20150708145822.GB10247@tucnak.redhat.com> <559D9A29.2020409@acm.org> <559F10F2.9050102@acm.org> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Sat, 11 Jul 2015 23:18:37 +0200 Message-ID: <87oaji1jgy.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Thu, 09 Jul 2015 20:25:22 -0400, Nathan Sidwell wrote: > This is the patch I committed. > --- internal-fn.c (revision 225323) > +++ internal-fn.c (working copy) > +static void > +expand_GOACC_FORK (gcall *stmt) > +{ > + rtx mode = expand_normal (gimple_call_arg (stmt, 0)); > + > +#ifdef HAVE_oacc_fork > + emit_insn (gen_oacc_fork (mode)); > +#endif > +} > + > +static void > +expand_GOACC_JOIN (gcall *stmt) > +{ > + rtx mode = expand_normal (gimple_call_arg (stmt, 0)); > + > +#ifdef HAVE_oacc_join > + emit_insn (gen_oacc_join (mode)); > +#endif > +} Committed in r225715: commit f9d00ca614a8dc28f21ab4a16d7cdbbe16668ca3 Author: tschwinge Date: Sat Jul 11 21:17:46 2015 +0000 Resolve bootstrap failure in expand_GOACC_FORK, expand_GOACC_JOIN [...]/source-gcc/gcc/internal-fn.c: In function 'void expand_GOACC_FORK(gcall*)': [...]/source-gcc/gcc/internal-fn.c:1970:7: error: unused variable 'mode' [-Werror=unused-variable] rtx mode = expand_normal (gimple_call_arg (stmt, 0)); ^ [...]/source-gcc/gcc/internal-fn.c: In function 'void expand_GOACC_JOIN(gcall*)': [...]/source-gcc/gcc/internal-fn.c:1980:7: error: unused variable 'mode' [-Werror=unused-variable] rtx mode = expand_normal (gimple_call_arg (stmt, 0)); ^ gcc/ * internal-fn.c (expand_GOACC_FORK, expand_GOACC_JOIN) [!HAVE_oacc_fork]: Keep quiet. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@225715 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 3 +++ gcc/internal-fn.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index 1f57a9d..ea3ea6b 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,5 +1,8 @@ 2015-07-11 Thomas Schwinge + * internal-fn.c (expand_GOACC_FORK, expand_GOACC_JOIN) + [!HAVE_oacc_fork]: Keep quiet. + * df-core.c (df_analyze_1): Don't disable df_verify call. 2015-07-10 Nathan Sidwell diff --git gcc/internal-fn.c gcc/internal-fn.c index e1c4c9a..b507208 100644 --- gcc/internal-fn.c +++ gcc/internal-fn.c @@ -2005,21 +2005,21 @@ expand_GOACC_DATA_END_WITH_ARG (gcall *stmt ATTRIBUTE_UNUSED) } static void -expand_GOACC_FORK (gcall *stmt) +expand_GOACC_FORK (gcall *stmt ATTRIBUTE_UNUSED) { - rtx mode = expand_normal (gimple_call_arg (stmt, 0)); - #ifdef HAVE_oacc_fork + rtx mode = expand_normal (gimple_call_arg (stmt, 0)); + emit_insn (gen_oacc_fork (mode)); #endif } static void -expand_GOACC_JOIN (gcall *stmt) +expand_GOACC_JOIN (gcall *stmt ATTRIBUTE_UNUSED) { - rtx mode = expand_normal (gimple_call_arg (stmt, 0)); - #ifdef HAVE_oacc_join + rtx mode = expand_normal (gimple_call_arg (stmt, 0)); + emit_insn (gen_oacc_join (mode)); #endif }