From patchwork Mon Jun 1 15:32:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 479089 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 08D50140FDA for ; Tue, 2 Jun 2015 01:32:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=PqDTyN2h; 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 :message-id:date:from:mime-version:to:subject:content-type; q= dns; s=default; b=h6wX7un3L2bKbt/8ha7hcwf902wIHT+fWeMtcyiQWGRk8a hKbK05xJwJNWpwTfnbZzfEaK6US28oOaLDSCz+dVbAXw+WsJmcYQACpMmSP6l2Um V4EgXim9uaBMw9Ix+H81mkevnGIx5Thj4gSd6aR6OskbEpClbJdqoTDD4I++A= 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 :message-id:date:from:mime-version:to:subject:content-type; s= default; bh=FumCcRhX9doDLWAomscnVDp7MOg=; b=PqDTyN2hCPULYIb1Ar8l 7U778sx8CTs9+cLYon1wIzq4Rma+Fik0BG7czVFligNSd3luLuM0Qfyl7VjgcGSj GA4+T704NHo+3CMJytGzijsiI1ubOAY6227lw69Q2zh2u4Njgt+7cMQt+EzjJTGc HrjErAWm1Ux6vM3/KKeXTzU= Received: (qmail 18642 invoked by alias); 1 Jun 2015 15:32:50 -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 18631 invoked by uid 89); 1 Jun 2015 15:32:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD, UPPERCASE_50_75 autolearn=no version=3.3.2 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 (AES256-SHA encrypted) ESMTPS; Mon, 01 Jun 2015 15:32:47 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57720) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1YzRhl-0004Bp-KN for gcc-patches@gnu.org; Mon, 01 Jun 2015 11:32:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzRhi-0006Wl-Du for gcc-patches@gnu.org; Mon, 01 Jun 2015 11:32:45 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:38048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzRhi-0006Wh-8M for gcc-patches@gnu.org; Mon, 01 Jun 2015 11:32:42 -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 1YzRhh-0004PC-4S from Tom_deVries@mentor.com ; Mon, 01 Jun 2015 08:32:41 -0700 Received: from [127.0.0.1] (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; Mon, 1 Jun 2015 16:32:39 +0100 Message-ID: <556C7B14.6060305@mentor.com> Date: Mon, 1 Jun 2015 17:32:36 +0200 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: , Jakub Jelinek Subject: [gomp4, committed] Fix goacc builtins fnspecs X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, this patch fixes the fnspec strings of the goacc builtins. The first position in an fnspec string is for the function result, even if it's a void function. This first entry is missing in the goacc fnspecs, attached patch fixes this. Committed to gomp-4_0-branch. Thanks, - Tom Fix goacc builtins fnspecs 2015-06-01 Tom de Vries * builtin-attrs.def (DOT_DOT_r_r_r): Remove DEF_ATTR_FOR_STRING. (DOT_DOT_DOT_DOT_r_r_r): Add DEF_ATTR_FOR_STRING. (ATTR_FNSPEC_DOT_DOT_r_r_r_NOTHROW_LIST): Remove DEF_ATTR_TREE_LIST. (ATTR_FNSPEC_DOT_DOT_DOT_DOT_r_r_r_NOTHROW_LIST): Add DEF_ATTR_TREE_LIST. * omp-builtins.def (BUILT_IN_GOACC_DATA_START) (BUILT_IN_GOACC_ENTER_EXIT_DATA, BUILT_IN_GOACC_KERNELS_INTERNAL) (BUILT_IN_GOACC_UPDATE): Fix fnspec. --- gcc/builtin-attrs.def | 7 ++++--- gcc/omp-builtins.def | 18 +++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gcc/builtin-attrs.def b/gcc/builtin-attrs.def index 2897c19d..da3ae80 100644 --- a/gcc/builtin-attrs.def +++ b/gcc/builtin-attrs.def @@ -65,7 +65,7 @@ DEF_ATTR_FOR_INT (6) ATTR_##ENUM, ATTR_NULL) DEF_ATTR_FOR_STRING (STR1, "1") DEF_ATTR_FOR_STRING (DOT_DOT_DOT_r_r_r, "...rrr") -DEF_ATTR_FOR_STRING (DOT_DOT_r_r_r, "..rrr") +DEF_ATTR_FOR_STRING (DOT_DOT_DOT_DOT_r_r_r, "....rrr") #undef DEF_ATTR_FOR_STRING /* Construct a tree for a list of two integers. */ @@ -132,8 +132,9 @@ DEF_ATTR_TREE_LIST (ATTR_PURE_NOTHROW_LEAF_LIST, ATTR_PURE, \ DEF_ATTR_TREE_LIST (ATTR_FNSPEC_DOT_DOT_DOT_r_r_r_NOTHROW_LIST, \ ATTR_FNSPEC, ATTR_LIST_DOT_DOT_DOT_r_r_r, \ ATTR_NOTHROW_LIST) -DEF_ATTR_TREE_LIST (ATTR_FNSPEC_DOT_DOT_r_r_r_NOTHROW_LIST, \ - ATTR_FNSPEC, ATTR_LIST_DOT_DOT_r_r_r, ATTR_NOTHROW_LIST) +DEF_ATTR_TREE_LIST (ATTR_FNSPEC_DOT_DOT_DOT_DOT_r_r_r_NOTHROW_LIST, \ + ATTR_FNSPEC, ATTR_LIST_DOT_DOT_DOT_DOT_r_r_r, \ + ATTR_NOTHROW_LIST) DEF_ATTR_TREE_LIST (ATTR_NORETURN_NOTHROW_LIST, ATTR_NORETURN, \ ATTR_NULL, ATTR_NOTHROW_LIST) DEF_ATTR_TREE_LIST (ATTR_NORETURN_NOTHROW_LEAF_LIST, ATTR_NORETURN,\ diff --git a/gcc/omp-builtins.def b/gcc/omp-builtins.def index dad9665..6e70d0b 100644 --- a/gcc/omp-builtins.def +++ b/gcc/omp-builtins.def @@ -33,21 +33,21 @@ along with GCC; see the file COPYING3. If not see DEF_GOACC_BUILTIN (BUILT_IN_ACC_GET_DEVICE_TYPE, "acc_get_device_type", BT_FN_INT, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN_FNSPEC (BUILT_IN_GOACC_DATA_START, "GOACC_data_start", - BT_FN_VOID_INT_SIZE_PTR_PTR_PTR, - ATTR_FNSPEC_DOT_DOT_r_r_r_NOTHROW_LIST, - ATTR_NOTHROW_LIST, "..rrr") + BT_FN_VOID_INT_SIZE_PTR_PTR_PTR, + ATTR_FNSPEC_DOT_DOT_DOT_r_r_r_NOTHROW_LIST, + ATTR_NOTHROW_LIST, "...rrr") DEF_GOACC_BUILTIN (BUILT_IN_GOACC_DATA_END, "GOACC_data_end", BT_FN_VOID, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN_FNSPEC (BUILT_IN_GOACC_ENTER_EXIT_DATA, "GOACC_enter_exit_data", BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR, - ATTR_FNSPEC_DOT_DOT_r_r_r_NOTHROW_LIST, - ATTR_NOTHROW_LIST, "..rrr") + ATTR_FNSPEC_DOT_DOT_DOT_r_r_r_NOTHROW_LIST, + ATTR_NOTHROW_LIST, "...rrr") DEF_GOACC_BUILTIN_FNSPEC (BUILT_IN_GOACC_KERNELS_INTERNAL, "GOACC_kernels_internal", BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_SIZE_INT_INT_VAR, - ATTR_FNSPEC_DOT_DOT_DOT_r_r_r_NOTHROW_LIST, - ATTR_NOTHROW_LIST, "...rrr") + ATTR_FNSPEC_DOT_DOT_DOT_DOT_r_r_r_NOTHROW_LIST, + ATTR_NOTHROW_LIST, "....rrr") DEF_GOACC_BUILTIN (BUILT_IN_GOACC_KERNELS, "GOACC_kernels", BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_SIZE_INT_INT_VAR, ATTR_NOTHROW_LIST) @@ -56,8 +56,8 @@ DEF_GOACC_BUILTIN (BUILT_IN_GOACC_PARALLEL, "GOACC_parallel", ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN_FNSPEC (BUILT_IN_GOACC_UPDATE, "GOACC_update", BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR, - ATTR_FNSPEC_DOT_DOT_r_r_r_NOTHROW_LIST, - ATTR_NOTHROW_LIST, "..rrr") + ATTR_FNSPEC_DOT_DOT_DOT_r_r_r_NOTHROW_LIST, + ATTR_NOTHROW_LIST, "...rrr") DEF_GOACC_BUILTIN (BUILT_IN_GOACC_WAIT, "GOACC_wait", BT_FN_VOID_INT_INT_VAR, ATTR_NOTHROW_LIST) -- 1.9.1