From patchwork Mon Nov  1 09:18:16 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jie Zhang <jie@codesourcery.com>
X-Patchwork-Id: 69754
Return-Path: 
 <gcc-patches-return-276940-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 D04E3B70D4
	for <incoming@patchwork.ozlabs.org>;
	Mon,  1 Nov 2010 20:18:28 +1100 (EST)
Received: (qmail 16677 invoked by alias); 1 Nov 2010 09:18:26 -0000
Received: (qmail 16661 invoked by uid 22791); 1 Nov 2010 09:18:24 -0000
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0	tests=AWL, BAYES_00,
	T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mail.codesourcery.com (HELO mail.codesourcery.com)
	(38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Mon, 01 Nov 2010 09:18:19 +0000
Received: (qmail 2439 invoked from network); 1 Nov 2010 09:18:17 -0000
Received: from unknown (HELO ?192.168.1.106?) (jie@127.0.0.2) by
	mail.codesourcery.com with ESMTPA; 1 Nov 2010 09:18:17 -0000
Message-ID: <4CCE85D8.3060107@codesourcery.com>
Date: Mon, 01 Nov 2010 17:18:16 +0800
From: Jie Zhang <jie@codesourcery.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.2.9) Gecko/20100918 Icedove/3.1.4
MIME-Version: 1.0
To: Jakub Jelinek <jakub@redhat.com>
CC: gcc-patches@gcc.gnu.org, Benjamin Kosnik <bkoz@redhat.com>
Subject: Re: [RFC] Fix libstdc++ test fails with emutls
References: <4CCE5416.1000001@codesourcery.com>
	<20101101074800.GX29412@tyan-ft48-01.lab.bos.redhat.com>
In-Reply-To: <20101101074800.GX29412@tyan-ft48-01.lab.bos.redhat.com>
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

On 11/01/2010 03:48 PM, Jakub Jelinek wrote:
> On Mon, Nov 01, 2010 at 01:45:58PM +0800, Jie Zhang wrote:
>> mutex:704: undefined reference to `__emutls_v._ZSt15__once_callable'
>>
>> This patch should fix this error by exporting such like symbols.
>>
>> Is this patch OK?
>
> You shouldn't be exporting symbols that weren't (even by mistake) exported
> earlier in older symbol versions, always add new symbols to the latest
> version (GLIBCXX_3.4.15 right now).

Thanks for your review! How about this? I moved them to GLIBCXX_3.4.15 
and added a comment.


Regards,


	* config/abi/pre/gnu.ver: Export __emutls_v._ZSt11__once_call
	and __emutls_v._ZSt15__once_callable.

Index: config/abi/pre/gnu.ver
===================================================================
--- config/abi/pre/gnu.ver	(revision 166125)
+++ config/abi/pre/gnu.ver	(working copy)
@@ -1187,6 +1187,10 @@
     # basic_filebuf::_M_get_ext_pos
     _ZNSt13basic_filebufI[cw]St11char_traitsI[cw]EE14_M_get_ext_pos*;
 
+    # targets using emutls
+    __emutls_v._ZSt11__once_call;
+    __emutls_v._ZSt15__once_callable;
+
 } GLIBCXX_3.4.14;
 
 # Symbols in the support library (libsupc++) have their own tag.