From patchwork Sun Nov 20 15:34:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 126653 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 DF182B71C4 for ; Mon, 21 Nov 2011 02:35:25 +1100 (EST) Received: (qmail 1430 invoked by alias); 20 Nov 2011 15:35:22 -0000 Received: (qmail 1214 invoked by uid 22791); 20 Nov 2011 15:35:20 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from c2beaomr08.btconnect.com (HELO mail.btconnect.com) (213.123.26.186) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 20 Nov 2011 15:35:03 +0000 Received: from host81-138-1-83.in-addr.btopenworld.com (EHLO thor.office) ([81.138.1.83]) by c2beaomr08.btconnect.com with ESMTP id FEG78583; Sun, 20 Nov 2011 15:34:56 +0000 (GMT) Cc: "Joseph S. Myers" , Rainer Orth , GCC Patches , Mike Stump Message-Id: <684BE489-AF8F-4110-8C23-4A362504B2FA@sandoe-acoustics.co.uk> From: Iain Sandoe To: Richard Henderson In-Reply-To: <4EC7F8CF.4000804@redhat.com> Mime-Version: 1.0 (Apple Message framework v936) Subject: Re: [Patch] make it possible for the target to rename ".tm_clone_table" Date: Sun, 20 Nov 2011 15:34:54 +0000 References: <9B90055E-5374-4B02-8396-75502119DC89@sandoe-acoustics.co.uk> <89484C79-C459-4F0B-A2EF-53CBE78AA6B3@sandoe-acoustics.co.uk> <4EC7F8CF.4000804@redhat.com> X-Mirapoint-IP-Reputation: reputation=Fair-1, source=Queried, refid=tid=0001.0A0B0303.4EC91E1F.003E, actions=tag X-Junkmail-Premium-Raw: score=8/50, refid=2.7.2:2011.11.20.144814:17:8.129, ip=81.138.1.83, rules=__MULTIPLE_RCPTS_CC_X2, __HAS_MSGID, __SANE_MSGID, __MSGID_APPLEMAIL, __TO_MALFORMED_2, __CT, __CTYPE_HAS_BOUNDARY, __CTYPE_MULTIPART, CTYPE_MULTIPART_NO_QUOTE, __CTYPE_MULTIPART_MIXED, __MIME_VERSION, __MIME_VERSION_APPLEMAIL, __BOUNCE_CHALLENGE_SUBJ, __BOUNCE_NDR_SUBJ_EXEMPT, __HAS_X_MAILER, __X_MAILER_APPLEMAIL, TXT_ATTACHED, __ANY_URI, __URI_NO_MAILTO, __URI_NO_WWW, __URI_NO_PATH, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_6000_6999, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, RDNS_SUSP_GENERIC, __USER_AGENT_APPLEMAIL, RDNS_SUSP, BODY_SIZE_7000_LESS, MIME_TEXT_ONLY_MP_MIXED, MULTIPLE_RCPTS X-Junkmail-Signature-Raw: score=unknown, refid=str=0001.0A0B020C.4EC91E20.0080, ss=1, re=0.000, fgs=0, ip=0.0.0.0, so=2011-07-25 19:15:43, dmn=2011-05-27 18:58:46, mode=multiengine X-IsSubscribed: yes 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 Hi Richard, On 19 Nov 2011, at 18:43, Richard Henderson wrote: > On 11/19/2011 02:04 AM, Iain Sandoe wrote: >> It should be possible for Rainer to define >> TARGET_ASM_TM_CLONE_TABLE_SECTION_NAME to NULL, and have varasm use >> the normal data section for tm_clone_table sections. One might >> wish to re-adjust testsuite/gcc.dg/tm/20100615.c if that is done. > > Well, not really. OSF is going to need an extension to collect2 in > order to create a single table, or changes to other bits of the > compiler to invoke _ITM_registerTMCloneTable for each object file's > table. > > ... actually, there seems to be some sort of merge error. I don't > see the crtstuff.c changes that called _ITM_registerTMCloneTable in > the first place. This might go some way to explaining my confusion :-) .. I did try to find any other reference to .tm_clone_table in the code and failed ... (varasm.c and the testsuite entry are the only two refs I can see). > I'd prefer we return a section object instead. I.e. pull the > call to get_named_section into the hook as well. as per attached? Iain gcc: * target.def (tm_clone_table_section): New hook. * doc/tm.texi.in (TARGET_ASM_TM_CLONE_TABLE_SECTION): Define. * doc/tm.texi: Regenerate. * varasm.c (dump_tm_clone_pairs): Use target tm_clone_table_section. * config/darwin.h (TARGET_ASM_TM_CLONE_TABLE_SECTION): New. * config/darwin-protos.h (darwin_tm_clone_table_section): New prototype. * config/darwin.c (darwin_tm_clone_table_section): New. gcc/testsuite: * gcc.dg/tm/20100615.c: Adjust for Darwin tm_clone_table section name. Index: gcc/varasm.c =================================================================== --- gcc/varasm.c (revision 181530) +++ gcc/varasm.c (working copy) @@ -5961,7 +5961,7 @@ dump_tm_clone_pairs (VEC(tm_alias_pair,heap) *tm_a if (!switched) { - switch_to_section (get_named_section (NULL, ".tm_clone_table", 3)); + switch_to_section (targetm.asm_out.tm_clone_table_section ()); assemble_align (POINTER_SIZE); switched = true; } @@ -5973,6 +5973,14 @@ dump_tm_clone_pairs (VEC(tm_alias_pair,heap) *tm_a } } +/* Provide a default for the tm_clone_table section. */ + +section * +default_clone_table_section (void) +{ + return get_named_section (NULL, ".tm_clone_table", 3); +} + /* Helper comparison function for qsorting by the DECL_UID stored in alias_pair->emitted_diags. */ Index: gcc/target.def =================================================================== --- gcc/target.def (revision 181530) +++ gcc/target.def (working copy) @@ -305,6 +305,13 @@ section names for mergeable constant data. Define the string if a different section name should be used.", const char *, ".rodata") +/* Return the section to be used for transactional memory clone tables. */ +DEFHOOK +(tm_clone_table_section, + "Return the section that should be used for transactional memory clone\ + tables.", + section *, (void), default_clone_table_section) + /* Output a constructor for a symbol with a given priority. */ DEFHOOK (constructor, Index: gcc/config/darwin.h =================================================================== --- gcc/config/darwin.h (revision 181530) +++ gcc/config/darwin.h (working copy) @@ -697,6 +697,10 @@ extern GTY(()) section * darwin_sections[NUM_DARWI #define TARGET_ASM_UNIQUE_SECTION darwin_unique_section #undef TARGET_ASM_FUNCTION_RODATA_SECTION #define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section + +#undef TARGET_ASM_TM_CLONE_TABLE_SECTION_NAME +#define TARGET_ASM_TM_CLONE_TABLE_SECTION darwin_tm_clone_table_section + #undef TARGET_ASM_RELOC_RW_MASK #define TARGET_ASM_RELOC_RW_MASK machopic_reloc_rw_mask Index: gcc/config/darwin.c =================================================================== --- gcc/config/darwin.c (revision 181530) +++ gcc/config/darwin.c (working copy) @@ -1265,6 +1265,12 @@ darwin_mergeable_constant_section (tree exp, return readonly_data_section; } +section * +darwin_tm_clone_table_section (void) +{ + return get_named_section (NULL, "__DATA,__tm_clone_table", 3); +} + int machopic_reloc_rw_mask (void) { Index: gcc/config/darwin-protos.h =================================================================== --- gcc/config/darwin-protos.h (revision 181530) +++ gcc/config/darwin-protos.h (working copy) @@ -58,6 +58,7 @@ extern int machopic_reloc_rw_mask (void); extern section *machopic_select_section (tree, int, unsigned HOST_WIDE_INT); extern section *darwin_function_section (tree, enum node_frequency, bool, bool); +extern section *darwin_tm_clone_table_section (void); extern void darwin_function_switched_text_sections (FILE *, tree, bool); extern void darwin_unique_section (tree decl, int reloc); Index: gcc/doc/tm.texi.in =================================================================== --- gcc/doc/tm.texi.in (revision 181530) +++ gcc/doc/tm.texi.in (working copy) @@ -7013,6 +7013,8 @@ otherwise. @hook TARGET_ASM_MERGEABLE_RODATA_PREFIX +@hook TARGET_ASM_TM_CLONE_TABLE_SECTION + @hook TARGET_ASM_SELECT_RTX_SECTION Return the section into which a constant @var{x}, of mode @var{mode}, should be placed. You can assume that @var{x} is some kind of Index: gcc/testsuite/gcc.dg/tm/20100615.c =================================================================== --- gcc/testsuite/gcc.dg/tm/20100615.c (revision 181530) +++ gcc/testsuite/gcc.dg/tm/20100615.c (working copy) @@ -3,7 +3,8 @@ /* Since the non TM version of new_node() gets optimized away, it shouldn't appear in the clone table either. */ -/* { dg-final { scan-assembler-not "tm_clone_table" } } */ +/* { dg-final { scan-assembler-not "tm_clone_table" { target { ! *-*-darwin* } } } } */ +/* { dg-final { scan-assembler-not "__DATA,__tm_clone_table" { target *-*-darwin* } } } */ #define NULL 0 extern void *malloc (__SIZE_TYPE__);