From patchwork Wed Jan 21 16:17:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 431552 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 7C005140276 for ; Thu, 22 Jan 2015 03:36:02 +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=vPHlZIltwEUAt607D hAsNouvETEBeNORBmdwDGipndM38VzhnKW8+RfuA2PlfUTMAp81vdlRyEmcOET41 rbKqphxLZUZcRxKrXJqTXG6VC3k4gqqzcxZp1tPuzH1wOlkIICh4JHItTXkZnklE 14u1F73rmwexTNu+5BJmx2y+NE= 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=Bd/5PodgM4w7kZZeT0SVM8B +KPo=; b=D+iJV0Ixdk/6hi6nX2oPhHpwdz3aAsumlxVlfzq5lUmjXNv6py+pHvK UpAg0ITikKRMxll3BroVWleDCjCe5rR63lzPfuoCd1cxsztT6/wFW1pDmW7XsE2c ANwg9lepCwBl7+MlHhCf+dISE3Q5DKTk44i6eoNd3gG6ErDS8RcI= Received: (qmail 12528 invoked by alias); 21 Jan 2015 16:35:42 -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 12494 invoked by uid 89); 21 Jan 2015 16:35:38 -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; Wed, 21 Jan 2015 16:35:34 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0LGZTTv003613 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 21 Jan 2015 11:35:32 -0500 Received: from localhost (ovpn-116-23.ams2.redhat.com [10.36.116.23]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0LGHf2M025875; Wed, 21 Jan 2015 11:17:42 -0500 Date: Wed, 21 Jan 2015 16:17:41 +0000 From: Jonathan Wakely To: "H.J. Lu" Cc: libstdc++ , GCC Patches Subject: Re: [patch] Add and last pieces of C++11 std::lib Message-ID: <20150121161741.GG3360@redhat.com> References: <20150116233830.GJ3360@redhat.com> <20150119132717.GF3360@redhat.com> <20150120115932.GS3360@redhat.com> <20150120175231.GB3360@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150120175231.GB3360@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) On 20/01/15 17:52 +0000, Jonathan Wakely wrote: >On 20/01/15 09:02 -0800, H.J. Lu wrote: >>On Linux/ia-32, I got >> >>output is: >>/tmp/ccApSqaQ.o: In function `facet::facet()':^M >>/export/gnu/import/git/gcc-test-x32/src-trunk/libstdc++-v3/testsuite/22_locale/ctype_byname/2.cc:29: >>undefined reference to >>`std::ctype_byname::ctype_byname(std::__cxx11::basic_string>std::char_traits, std::allocator > const&, unsigned >>int)'^M >>/tmp/ccApSqaQ.o: In function `facet::facet()':^M >>/export/gnu/import/git/gcc-test-x32/src-trunk/libstdc++-v3/testsuite/22_locale/ctype_byname/2.cc:29: >>undefined reference to >>`std::ctype_byname::ctype_byname(std::__cxx11::basic_string>std::char_traits, std::allocator > const&, unsigned >>int)'^M >>collect2: error: ld returned 1 exit status^M >> >>FAIL: 22_locale/ctype_byname/2.cc (test for excess errors) >>FAIL: libstdc++-abi/abi_check > >I forgot that the mangled name for size_t depends on the target, so >the linker script needs [jm] instead of m. Patch coming soon ... This fixes the new FAILs on i686. Tested x86_64-linux and i686-linux, committed to trunk. I expect the new symbols are going to cause a problem on Solaris as they match more than one symbol version, so I'll fix that ASAP. commit 0715599f0458f89fe6d9ce6268008b95b6d022e6 Author: Jonathan Wakely Date: Tue Jan 20 18:51:07 2015 +0000 * config/abi/pre/gnu.ver: Use [jmy] for size_t parameters. diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 61024bd..9d06f7a 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -187,7 +187,7 @@ GLIBCXX_3.4 { std::__num_base::_S_atoms_out; std::__moneypunct_cache*; std::__numpunct_cache*; - std::__timepunct_cache* + std::__timepunct_cache*; # __gnu_debug::_Error_formatter* }; @@ -1150,7 +1150,7 @@ GLIBCXX_3.4.10 { _ZNKSt4hashISsEclESs; _ZNKSt4hashIeEclEe; - _ZSt17__verify_groupingPKc[mj]RKSs; + _ZSt17__verify_groupingPKc[jmy]RKSs; _ZNSt8__detail12__prime_listE; _ZNSt3tr18__detail12__prime_listE; @@ -1729,7 +1729,7 @@ GLIBCXX_3.4.21 { _ZSt9use_facetINSt7__cxx118numpunct*; _ZSt9use_facetINSt7__cxx118time_get*; - _ZSt17__verify_groupingPKc[mj]RKNSt7__cxx1112basic_string*; + _ZSt17__verify_groupingPKc[jmy]RKNSt7__cxx1112basic_string*; _ZNSt3_V214error_category*; _ZNKSt3_V214error_category*; @@ -1793,23 +1793,23 @@ GLIBCXX_3.4.21 { _ZT[ISV]St25__codecvt_utf8_utf16_base*; # new string ctors for _byname facets - _ZNSt12ctype_bynameI[cw]EC[1-5]ERKSsm; - _ZNSt14codecvt_bynameI[cw]c11__mbstate_tEC[1-5]ERKSsm; - _ZNSt15messages_bynameI[cw]EC[1-5]ERKSsm; - _ZNSt15numpunct_bynameI[cw]EC[1-5]ERKSsm; - _ZNSt15time_get_bynameI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEEC[1-5]ERKSsm; - _ZNSt15time_put_bynameI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEEC[1-5]ERKSsm; - _ZNSt17moneypunct_bynameI[cw]Lb0EEC[1-5]ERKSsm; - _ZNSt17moneypunct_bynameI[cw]Lb1EEC[1-5]ERKSsm; - - _ZNSt12ctype_bynameI[cw]EC[1-5]ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm; - _ZNSt14codecvt_bynameI[cw]c11__mbstate_tEC[1-5]ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm; - _ZNSt15time_put_bynameI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEEC[1-5]ERKNSt7__cxx1112basic_stringIcS2_SaIcEEEm; - _ZNSt7__cxx1115messages_bynameI[cw]EC[1-5]ERKNS_12basic_stringIcSt11char_traitsIcESaIcEEEm; - _ZNSt7__cxx1115numpunct_bynameI[cw]EC[1-5]ERKNS_12basic_stringIcSt11char_traitsIcESaIcEEEm; - _ZNSt7__cxx1115time_get_bynameI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEEC[1-5]ERKNS_12basic_stringIcS3_SaIcEEEm; - _ZNSt7__cxx1117moneypunct_bynameI[cw]Lb0EEC[1-5]ERKNS_12basic_stringIcSt11char_traitsIcESaIcEEEm; - _ZNSt7__cxx1117moneypunct_bynameI[cw]Lb1EEC[1-5]ERKNS_12basic_stringIcSt11char_traitsIcESaIcEEEm; + _ZNSt12ctype_bynameI[cw]EC[1-5]ERKSs[jmy]; + _ZNSt14codecvt_bynameI[cw]c11__mbstate_tEC[1-5]ERKSs[jmy]; + _ZNSt15messages_bynameI[cw]EC[1-5]ERKSs[jmy]; + _ZNSt15numpunct_bynameI[cw]EC[1-5]ERKSs[jmy]; + _ZNSt15time_get_bynameI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEEC[1-5]ERKSs[jmy]; + _ZNSt15time_put_bynameI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEEC[1-5]ERKSs[jmy]; + _ZNSt17moneypunct_bynameI[cw]Lb0EEC[1-5]ERKSs[jmy]; + _ZNSt17moneypunct_bynameI[cw]Lb1EEC[1-5]ERKSs[jmy]; + + _ZNSt12ctype_bynameI[cw]EC[1-5]ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE[jmy]; + _ZNSt14codecvt_bynameI[cw]c11__mbstate_tEC[1-5]ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE[jmy]; + _ZNSt15time_put_bynameI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEEC[1-5]ERKNSt7__cxx1112basic_stringIcS2_SaIcEEE[jmy]; + _ZNSt7__cxx1115messages_bynameI[cw]EC[1-5]ERKNS_12basic_stringIcSt11char_traitsIcESaIcEEE[jmy]; + _ZNSt7__cxx1115numpunct_bynameI[cw]EC[1-5]ERKNS_12basic_stringIcSt11char_traitsIcESaIcEEE[jmy]; + _ZNSt7__cxx1115time_get_bynameI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEEC[1-5]ERKNS_12basic_stringIcS3_SaIcEEE[jmy]; + _ZNSt7__cxx1117moneypunct_bynameI[cw]Lb0EEC[1-5]ERKNS_12basic_stringIcSt11char_traitsIcESaIcEEE[jmy]; + _ZNSt7__cxx1117moneypunct_bynameI[cw]Lb1EEC[1-5]ERKNS_12basic_stringIcSt11char_traitsIcESaIcEEE[jmy]; } GLIBCXX_3.4.20;