From patchwork Tue Jan 6 11:02:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 425610 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 9719814009B for ; Tue, 6 Jan 2015 22:03:05 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=uK7MPoJQes/xPkhRu jT24+n6RS6tp9WKCvuEVEtzGO9/A/gVoVFHs7CvYypUVtryjeGbiAjGHVs4CLfD2 AMBbeJq9Ckp2DEE4cwV7B//7I/GefZ0lnvJA+7o3xqOrI/p3uzIBreheuR+pVUoi Ox3h1ANJIdKajU7atzEjBJkfBY= 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:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=default; bh=X1BcC7d/DI7uTBFlqT+6V8F m2t0=; b=Kbsr/wynn2nqcNKce+cQGA3PolgeyucJyB1lkIwaYNy2tgC8XLW/YDW 1hxNiCKt139h3VRRnJD3M5pv9a+YOLkAryuA5MRlkQtabNnwh0aSDn7HAYiCTXRY YvynUYXFG4Dn55dUxpQ8kmZQ/sJGcjqFVIpjS6ijRJymdRc189kk= Received: (qmail 15543 invoked by alias); 6 Jan 2015 11:02:57 -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 15509 invoked by uid 89); 6 Jan 2015 11:02:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 06 Jan 2015 11:02:55 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t06B2pOk022161 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 6 Jan 2015 06:02:51 -0500 Received: from localhost (ovpn-112-63.ams2.redhat.com [10.36.112.63]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t06B2nwJ021313; Tue, 6 Jan 2015 06:02:50 -0500 Date: Tue, 6 Jan 2015 11:02:48 +0000 From: Jonathan Wakely To: Rainer Orth Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [patch] New std::string implementation Message-ID: <20150106110248.GB3134@redhat.com> References: <20141114154330.GH5191@redhat.com> <20141128152448.GQ5191@redhat.com> <20141128165532.GR5191@redhat.com> <20141219182333.GE3134@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) On 06/01/15 10:52 +0100, Rainer Orth wrote: >Unfortunately, this patch broke Solaris bootstrap with /bin/ld: >libstdc++.so fails to link with > >ld: fatal: libstdc++-symbols.ver-sun: 5383: symbol 'std::locale::name[abi:cxx11]() const': symbol version conflict > >l.5383 has > > ##_ZNKSt6locale4nameB5cxx11Ev (glob) > _ZNKSt6locale4nameB5cxx11Ev; > >i.e. > > # std::locale::name() returning new std::string > >in GLIBCXX_3.4.21 vs. > > ##std::locale::[A-Zn-z]* (cxx) > _ZNKSt6locale4nameB5cxx11Ev; > >in GLIBCXX_3.4. Drat, I even tried to avoid that conflict, but apparently I thought the letter that comes after 'n' is 'n'! Does this fix it? Hmm, I think the [A-Zo-z] glob depends on the locale's collation order, maybe it should be just [o-z] since we don't have any symbols matching std::locale::[A-Z]* anyway. That's something else to clean up later. --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -118,7 +118,7 @@ GLIBCXX_3.4 { # std::locale::name(); std::locale::none*; std::locale::numeric*; - std::locale::[A-Zn-z]*; + std::locale::[A-Zo-z]*; std::locale::_[A-Ha-z]*; std::locale::_Impl::[A-Za-z]*; # std::locale::_Impl::_M_[A-Za-z]*;