From patchwork Thu Jan 13 15:51:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 78771 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]) by ozlabs.org (Postfix) with SMTP id D6410B70B3 for ; Fri, 14 Jan 2011 02:52:11 +1100 (EST) Received: (qmail 29533 invoked by alias); 13 Jan 2011 15:52:08 -0000 Received: (qmail 29516 invoked by uid 22791); 13 Jan 2011 15:52:06 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD, UPPERCASE_50_75 X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 13 Jan 2011 15:52:02 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0DFq0ht011207 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 13 Jan 2011 10:52:00 -0500 Received: from vishnu.quesejoda.com (vpn-234-164.phx2.redhat.com [10.3.234.164]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p0DFpxwO031413; Thu, 13 Jan 2011 10:51:59 -0500 Message-ID: <4D2F1F9F.5010404@redhat.com> Date: Thu, 13 Jan 2011 09:51:59 -0600 From: Aldy Hernandez User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b3pre Thunderbird/3.1.7 MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org, MARLIER Patrick , Richard Henderson Subject: [trans-mem] PATCH committed: cleanup attributes 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 [Courtesy of Patrick Marlier] This patch renames the TM_PURE attributes to avoid confusion with GCC's PURE attribute. Minor cleanups; all cosmetic. Applied as obvious. * builtin-attrs.def (ATTR_TM_PURE_NOTHROW_LIST): Remove duplicated attribute. (ATTR_TM_TMPURE): Rename from ATTR_TM_PURE to avoid confusion with pure attribute. * gtm-builtins.def: Likewise. Index: builtin-attrs.def =================================================================== --- builtin-attrs.def (revision 168743) +++ builtin-attrs.def (working copy) @@ -95,7 +95,7 @@ DEF_ATTR_IDENT (ATTR_STRFMON, "strfmon") DEF_ATTR_IDENT (ATTR_STRFTIME, "strftime") DEF_ATTR_IDENT (ATTR_TYPEGENERIC, "type generic") DEF_ATTR_IDENT (ATTR_TM_REGPARM, "*tm regparm") -DEF_ATTR_IDENT (ATTR_TM_PURE, "transaction_pure") +DEF_ATTR_IDENT (ATTR_TM_TMPURE, "transaction_pure") DEF_ATTR_TREE_LIST (ATTR_NOVOPS_LIST, ATTR_NOVOPS, ATTR_NULL, ATTR_NULL) @@ -199,20 +199,15 @@ DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFMON,3,3 DEF_ATTR_TREE_LIST (ATTR_TM_NOTHROW_LIST, ATTR_TM_REGPARM, ATTR_NULL, ATTR_NOTHROW_LIST) DEF_ATTR_TREE_LIST (ATTR_TM_TMPURE_NOTHROW_LIST, - ATTR_TM_PURE, ATTR_NULL, ATTR_TM_NOTHROW_LIST) + ATTR_TM_TMPURE, ATTR_NULL, ATTR_TM_NOTHROW_LIST) DEF_ATTR_TREE_LIST (ATTR_TM_PURE_TMPURE_NOTHROW_LIST, ATTR_PURE, ATTR_NULL, ATTR_TM_TMPURE_NOTHROW_LIST) DEF_ATTR_TREE_LIST (ATTR_TM_NORETURN_NOTHROW_LIST, ATTR_TM_REGPARM, ATTR_NULL, ATTR_NORETURN_NOTHROW_LIST) DEF_ATTR_TREE_LIST (ATTR_TM_CONST_NOTHROW_LIST, ATTR_TM_REGPARM, ATTR_NULL, ATTR_CONST_NOTHROW_LIST) - -/* Same attributes used for BUILT_IN_MALLOC except with TM_PURE thrown in. */ -DEF_ATTR_TREE_LIST (ATTR_TM_PURE_MALLOC_NOTHROW_LIST, - ATTR_TM_PURE, ATTR_NULL, ATTR_MALLOC_NOTHROW_LIST) -/* Same attributes used for BUILT_IN_FREE except with TM_PURE thrown in. */ -DEF_ATTR_TREE_LIST (ATTR_TM_PURE_NOTHROW_LIST, - ATTR_TM_PURE, ATTR_NULL, ATTR_NOTHROW_LIST) +DEF_ATTR_TREE_LIST (ATTR_TM_TMPURE_MALLOC_NOTHROW_LIST, + ATTR_TM_TMPURE, ATTR_NULL, ATTR_MALLOC_NOTHROW_LIST) /* Construct a tree for a format_arg attribute. */ #define DEF_FORMAT_ARG_ATTRIBUTE(FA) \ Index: gtm-builtins.def =================================================================== --- gtm-builtins.def (revision 168743) +++ gtm-builtins.def (working copy) @@ -11,9 +11,9 @@ DEF_TM_BUILTIN (BUILT_IN_TM_IRREVOCABLE, BT_FN_INT, ATTR_TM_NOTHROW_LIST) DEF_TM_BUILTIN (BUILT_IN_TM_MEMCPY, "_ITM_memcpyRtWt", - BT_FN_PTR_PTR_CONST_PTR_SIZE, ATTR_TM_PURE_NOTHROW_LIST) + BT_FN_PTR_PTR_CONST_PTR_SIZE, ATTR_TM_TMPURE_NOTHROW_LIST) DEF_TM_BUILTIN (BUILT_IN_TM_MEMMOVE, "_ITM_memmoveRtWt", - BT_FN_PTR_PTR_CONST_PTR_SIZE, ATTR_TM_PURE_NOTHROW_LIST) + BT_FN_PTR_PTR_CONST_PTR_SIZE, ATTR_TM_TMPURE_NOTHROW_LIST) DEF_TM_BUILTIN (BUILT_IN_TM_GETTMCLONE_IRR, "_ITM_getTMCloneOrIrrevocable", BT_FN_PTR_PTR, ATTR_TM_CONST_NOTHROW_LIST) @@ -22,11 +22,11 @@ DEF_TM_BUILTIN (BUILT_IN_TM_GETTMCLONE_S /* Memory allocation builtins. */ DEF_TM_BUILTIN (BUILT_IN_TM_MALLOC, "_ITM_malloc", - BT_FN_PTR_SIZE, ATTR_TM_PURE_MALLOC_NOTHROW_LIST) + BT_FN_PTR_SIZE, ATTR_TM_TMPURE_MALLOC_NOTHROW_LIST) DEF_TM_BUILTIN (BUILT_IN_TM_CALLOC, "_ITM_calloc", - BT_FN_PTR_SIZE_SIZE, ATTR_TM_PURE_MALLOC_NOTHROW_LIST) + BT_FN_PTR_SIZE_SIZE, ATTR_TM_TMPURE_MALLOC_NOTHROW_LIST) DEF_TM_BUILTIN (BUILT_IN_TM_FREE, "_ITM_free", - BT_FN_VOID_PTR, ATTR_TM_PURE_NOTHROW_LIST) + BT_FN_VOID_PTR, ATTR_TM_TMPURE_NOTHROW_LIST) /* Logging builtins. */ DEF_TM_BUILTIN (BUILT_IN_TM_LOG_1, "_ITM_LU1",