From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DBE0438543AB for ; Fri, 13 Jan 2023 00:16:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DBE0438543AB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673568963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jhxx7jhi7aQ59Ig25rQJ4oH0d99o7MQERkLojncgQE4=; b=fbQiIFpSmEXsm12QGTaOyDlDmmFU2qB5QIr0N28ejlGSmr0gwon0dBmaI8aFC4gY1YbjN4 D9NovxLUPU2qkpdTvAmMnn5qqWwPflxV5blkOp509+lri6+cvcYG8Lb+e1AozMNFhJGQ9/ 1ODMkuAgNZfhtkcgoGJ7HhnKwMB8ATk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-653-wn4UXVt6OSuckxGxHXC1mA-1; Thu, 12 Jan 2023 19:16:00 -0500 X-MC-Unique: wn4UXVt6OSuckxGxHXC1mA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E90A8801779; Fri, 13 Jan 2023 00:15:59 +0000 (UTC) Received: from localhost (unknown [10.33.36.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2C1E492B00; Fri, 13 Jan 2023 00:15:59 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix exports for IEEE128 versions of __try_use_facet [PR108327] Date: Fri, 13 Jan 2023 00:15:59 +0000 Message-Id: <20230113001559.944194-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested x86_64-linux and powerpc64le-linux. Pushed to trunk. -- >8 -- The new symbols need to be exported, as well as some of the std::locale::facet::id globals, which are not new but were presumably not needed by any inline functions before now. libstdc++-v3/ChangeLog: PR libstdc++/108327 * config/os/gnu-linux/ldbl-extra.ver (GLIBCXX_LDBL_3.4.31): Export __try_use_facet specializations for facets in namespace __gnu_cxx_ldbl128. * config/os/gnu-linux/ldbl-ieee128-extra.ver (GLIBCXX_IEEE128_3.4.31): Likewise for facets in namespace __gnu_cxx_ieee128. * testsuite/util/testsuite_abi.cc: Add to lists of known and latest versions. --- libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver | 4 ++++ libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver | 7 +++++++ libstdc++-v3/testsuite/util/testsuite_abi.cc | 9 ++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver b/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver index 8c7c783ba58..ba7cc3308f7 100644 --- a/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver +++ b/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver @@ -45,6 +45,10 @@ GLIBCXX_LDBL_3.4.29 { _ZSt8to_charsPcS_g*; } GLIBCXX_LDBL_3.4.21; +GLIBCXX_LDBL_3.4.31 { + _ZSt15__try_use_facetINSt17__gnu_cxx_ldbl128[789]*; +} GLIBCXX_LDBL_3.4.29; + CXXABI_LDBL_1.3 { _ZT[IS]g; _ZT[IS]Pg; diff --git a/libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver b/libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver index 830cb8c40f4..17d696364c4 100644 --- a/libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver +++ b/libstdc++-v3/config/os/gnu-linux/ldbl-ieee128-extra.ver @@ -50,6 +50,13 @@ GLIBCXX_IEEE128_3.4.30 { _ZNSt17__gnu_cxx_ieee12816__convert_from_vERKP15__locale_structPciPKcz; } GLIBCXX_3.4.30; +GLIBCXX_IEEE128_3.4.31 { + _ZSt15__try_use_facetINSt17__gnu_cxx_ieee1287num_get*; + _ZSt15__try_use_facetINSt17__gnu_cxx_ieee1287num_put*; + _ZNSt19__gnu_cxx11_ieee1289money_getI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEE2idE; + _ZNSt19__gnu_cxx11_ieee1289money_putI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEE2idE; +} GLIBCXX_3.4.31; + CXXABI_IEEE128_1.3.13 { _ZT[IS]u9__ieee128; diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc index 27616f5987e..f838d27cfb5 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -210,11 +210,13 @@ check_version(symbol& test, bool added) known_versions.push_back("GLIBCXX_3.4.27"); known_versions.push_back("GLIBCXX_3.4.28"); known_versions.push_back("GLIBCXX_3.4.29"); + known_versions.push_back("GLIBCXX_LDBL_3.4.29"); known_versions.push_back("GLIBCXX_3.4.30"); known_versions.push_back("GLIBCXX_3.4.31"); - known_versions.push_back("GLIBCXX_LDBL_3.4.29"); + known_versions.push_back("GLIBCXX_LDBL_3.4.31"); known_versions.push_back("GLIBCXX_IEEE128_3.4.29"); known_versions.push_back("GLIBCXX_IEEE128_3.4.30"); + known_versions.push_back("GLIBCXX_IEEE128_3.4.31"); known_versions.push_back("CXXABI_1.3"); known_versions.push_back("CXXABI_LDBL_1.3"); known_versions.push_back("CXXABI_1.3.1"); @@ -250,8 +252,9 @@ check_version(symbol& test, bool added) // Check that added symbols are added in the latest pre-release version. bool latestp = (test.version_name == "GLIBCXX_3.4.31" - // XXX remove next line when baselines have been regenerated. - || test.version_name == "GLIBCXX_IEEE128_3.4.30" + // XXX remove next 2 lines when baselines have been regenerated. + || test.version_name == "GLIBCXX_IEEE128_3.4.31" + || test.version_name == "GLIBCXX_LDBL_3.4.31" || test.version_name == "CXXABI_1.3.14" || test.version_name == "CXXABI_FLOAT128" || test.version_name == "CXXABI_TM_1"); -- 2.39.0