From patchwork Mon Jan 16 16:41:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 136312 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 ABE2BB6EFF for ; Tue, 17 Jan 2012 03:42:10 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1327336932; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Cc:Subject:References:Date:In-Reply-To: Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=70KZRcpwlW8tzhpLvF9ruQjJH4M=; b=sEKMesy/lrNCM7I7crxQKMUzZu50IZnINyjdKuXlri33p29xerMFQCUOp82Vkk QZJwsQOYU3/FmepVNrWbIkeSlMwwRiHOgruncfnDDc3jKLg7rXs2q4mARJEsoJuj +gmcgQJf1XIGd2UIK4qsoRpb5vxi2MutJnn/O9zf1L6bk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:From:To:Cc:Subject:References:Date:In-Reply-To:Message-ID:User-Agent:MIME-Version:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=qWQBQnu4kUMYk5+FLd32Oyvz2vcE7GF6a4ktYzLz2dyyVj/0ak+jfEpDF1kdgo zaJXANB1xTu9n9RVGUUea8fZa2/EwMiLvE+l68EFFXQFvN0HALn1D9BUz8NCwTWN ori6fkeuEiIoTd1sD9uygo+9jMepmhkVoaawEBKqokIPE=; Received: (qmail 24311 invoked by alias); 16 Jan 2012 16:42:07 -0000 Received: (qmail 24218 invoked by uid 22791); 16 Jan 2012 16:42:05 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 16 Jan 2012 16:41:51 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 786A7AF; Mon, 16 Jan 2012 17:41:50 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id auiI7Hny2rkq; Mon, 16 Jan 2012 17:41:48 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 6C258AE; Mon, 16 Jan 2012 17:41:48 +0100 (CET) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id q0GGfl0M012826; Mon, 16 Jan 2012 17:41:47 +0100 (MET) From: Rainer Orth To: Torvald Riegel Cc: gcc-patches@gcc.gnu.org, Richard Henderson , Paolo Bonzini Subject: Re: [libitm, build] Support sun symbol versioning References: <1321904139.12248.69.camel@triegel.csb> Date: Mon, 16 Jan 2012 17:41:47 +0100 In-Reply-To: <1321904139.12248.69.camel@triegel.csb> (Torvald Riegel's message of "Mon, 21 Nov 2011 20:35:39 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 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 Torvald Riegel writes: > On Mon, 2011-11-21 at 15:06 +0100, Rainer Orth wrote: >> * _ITM_getThreadnum is the only symbol in libitm.map that isn't present >> in the library. It's documented as missing and should perhaps be >> removed from the map? > > Yes, this is not supported anymore. Here's the patch that removes it. I think this should go in before 4.7.0 is released: if the function is added later, it would incorrectly end up in the LIBITM_1.0, defeating the purpose of symbol versioning. Bootstrapped without regressions on i386-pc-solaris2.11 and verified that the symbol version info is unchanged. Ok for mainline? Rainer 2012-01-14 Rainer Orth * libitm.h (_ITM_getThreadnum): Remove. * libitm.map (_ITM_getThreadnum): Remove from LIBITM_1.0. # HG changeset patch # Parent e9235a85428f1c332d0b4346142aabc0d3c3990c Remove _ITM_getThreadnum diff --git a/libitm/libitm.h b/libitm/libitm.h --- a/libitm/libitm.h +++ b/libitm/libitm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2009, 2011, 2012 Free Software Foundation, Inc. Contributed by Richard Henderson . This file is part of the GNU Transactional Memory Library (libitm). @@ -149,8 +149,6 @@ extern void _ITM_addUserCommitAction(_IT extern void _ITM_addUserUndoAction(_ITM_userUndoFunction, void *) ITM_REGPARM; -extern int _ITM_getThreadnum(void) ITM_REGPARM; - extern void _ITM_dropReferences (void *, size_t) ITM_REGPARM ITM_PURE; extern void *_ITM_malloc (size_t) diff --git a/libitm/libitm.map b/libitm/libitm.map --- a/libitm/libitm.map +++ b/libitm/libitm.map @@ -8,7 +8,6 @@ LIBITM_1.0 { _ITM_commitTransaction; _ITM_commitTransactionEH; _ITM_error; - _ITM_getThreadnum; _ITM_getTransactionId; _ITM_inTransaction; _ITM_libraryVersion;