From patchwork Tue Nov 10 20:39:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 542609 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 686B31413B9 for ; Wed, 11 Nov 2015 07:39:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=tm/IUDsB; 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 :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=uOO3J20sjndpo04iy Gv9U9IUUe5YJNsV/rjMP/caIAc3n4rssjDbMqDQvuVdFHhnsMFZrUtr/BvKpS+yF qvlhW57RVkt44qpsuyxTGZ5+DUiW+wt35xfuG8IxYPlRSGslNq2cC/4ymkl8QUp9 svgz2AWmLkB4g1vxFGyoweQhAc= 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 :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=czwgZV+r0hozxevoAy9iU4J iifQ=; b=tm/IUDsBG07xSPK+chCl2eAZQhUCcFUfZSxevhnAFUB5CDZUoq1BLE7 0aSeFYwv6iZbaaI5jvBKJTYckA9P76TUByTZBbybBepeZ9eiX1hwOf+/B087MiVZ DNKH/Ocpd4G3yz6kLYTcAPEdEb7szwo4QSooZvhUu7ktVd3SqSro= Received: (qmail 111156 invoked by alias); 10 Nov 2015 20:39:20 -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 111142 invoked by uid 89); 10 Nov 2015 20:39:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qg0-f42.google.com Received: from mail-qg0-f42.google.com (HELO mail-qg0-f42.google.com) (209.85.192.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 10 Nov 2015 20:39:19 +0000 Received: by qgad10 with SMTP id d10so8357391qga.3 for ; Tue, 10 Nov 2015 12:39:17 -0800 (PST) X-Received: by 10.140.234.66 with SMTP id f63mr7372337qhc.61.1447187956996; Tue, 10 Nov 2015 12:39:16 -0800 (PST) Received: from ?IPv6:2601:181:c000:c497:a2a8:cdff:fe3e:b48? ([2601:181:c000:c497:a2a8:cdff:fe3e:b48]) by smtp.googlemail.com with ESMTPSA id t18sm1999830qkt.26.2015.11.10.12.39.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Nov 2015 12:39:16 -0800 (PST) Subject: Re: [gomp4] Random omp-low.c backporting To: Thomas Schwinge References: <5641FD06.9010504@acm.org> <87pozhvmwl.fsf@kepler.schwinge.homeip.net> Cc: GCC Patches From: Nathan Sidwell Message-ID: <564255F3.6020404@acm.org> Date: Tue, 10 Nov 2015 15:39:15 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <87pozhvmwl.fsf@kepler.schwinge.homeip.net> On 11/10/15 11:28, Thomas Schwinge wrote: > Hi Nathan! > > On Tue, 10 Nov 2015 09:19:50 -0500, Nathan Sidwell wrote: >> I've committed this to backport a bunch of random bits from trunk to gomp4, and >> thereby reduce divergence. > > Yeah, I had some of these on my list, too. > >> --- omp-low.c (revision 230080) >> +++ omp-low.c (working copy) >> @@ -12515,7 +12485,7 @@ replace_oacc_fn_attrib (tree fn, tree di >> function attribute. Push any that are non-constant onto the ARGS >> list, along with an appropriate GOMP_LAUNCH_DIM tag. */ >> >> -void >> +static void >> set_oacc_fn_attrib (tree fn, tree clauses, vec *args) >> { >> /* Must match GOMP_DIM ordering. */ > fixed. Not sure why I don't encounter these build problems ... nathan 2015-11-10 Nathan Sidwell * omp-low.c (set_oacc_fn_attrib): Revert static storage specifier. Index: gcc/omp-low.c =================================================================== --- gcc/omp-low.c (revision 230120) +++ gcc/omp-low.c (working copy) @@ -12574,7 +12574,7 @@ replace_oacc_fn_attrib (tree fn, tree di function attribute. Push any that are non-constant onto the ARGS list, along with an appropriate GOMP_LAUNCH_DIM tag. */ -static void +void set_oacc_fn_attrib (tree fn, tree clauses, vec *args) { /* Must match GOMP_DIM ordering. */