[gcc r14-9917] libstdc++: Export std::__basic_file::native_handle as GLIBCXX_3.4.33 [PR114692]

[gcc r14-9917] libstdc++: Export std::__basic_file::native_handle as GLIBCXX_3.4.33 [PR114692]

[Jonathan Wakely]

https://gcc.gnu.org/g:1defe743aeb19532f6d6f4cab37e10f11467abd8

commit r14-9917-g1defe743aeb19532f6d6f4cab37e10f11467abd8
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Apr 11 12:28:25 2024 +0100

    libstdc++: Export std::__basic_file::native_handle as GLIBCXX_3.4.33 [PR114692]
    
    I added this new symbol in the wrong version. GLIBCXX_3.4.32 was
    already used for the GCC 13.2.0 release, so the new symbol should have
    been in a new GLIBCXX_3.4.33 version.
    
    Additionally, the pattern doesn't need to use [cw] because we only ever
    use __basic_file<char>, even for std::basic_filebuf<wchar_t>.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/114692
            * config/abi/pre/gnu.ver (GLIBCXX_3.4.32): Move new exports for
            __basic_file::native_handle to ...
            (GLIBCXX_3.4.33): ... here. Adjust to not match wchar_t
            specialization, which isn't used.
            * testsuite/util/testsuite_abi.cc: Add GLIBCXX_3.4.33 and update
            latest version check.

Diff:
---
 libstdc++-v3/config/abi/pre/gnu.ver          | 9 +++++++--
 libstdc++-v3/testsuite/util/testsuite_abi.cc | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index db20d75b68e..31449b5b87b 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -2516,13 +2516,18 @@ GLIBCXX_3.4.31 {
 
 } GLIBCXX_3.4.30;
 
+# GCC 13.2.0
 GLIBCXX_3.4.32 {
     _ZSt21ios_base_library_initv;
     _ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE11_S_allocateERS3_[jmy];
-    # std::basic_file<>::native_handle()
-    _ZNKSt12__basic_fileI[cw]E13native_handleEv;
 } GLIBCXX_3.4.31;
 
+# GCC 14.1.0
+GLIBCXX_3.4.33 {
+    # std::basic_file<char>::native_handle()
+    _ZNKSt12__basic_fileIcE13native_handleEv;
+} GLIBCXX_3.4.32;
+
 # Symbols in the support library (libsupc++) have their own tag.
 CXXABI_1.3 {
 
diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc
index 4f3846b9cc2..e4bf3cdc8e0 100644
--- a/libstdc++-v3/testsuite/util/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
@@ -214,6 +214,7 @@ check_version(symbol& test, bool added)
       known_versions.push_back("GLIBCXX_3.4.30");
       known_versions.push_back("GLIBCXX_3.4.31");
       known_versions.push_back("GLIBCXX_3.4.32");
+      known_versions.push_back("GLIBCXX_3.4.33");
       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");
@@ -253,7 +254,7 @@ check_version(symbol& test, bool added)
 	test.version_status = symbol::incompatible;
 
       // Check that added symbols are added in the latest pre-release version.
-      bool latestp = (test.version_name == "GLIBCXX_3.4.32"
+      bool latestp = (test.version_name == "GLIBCXX_3.4.33"
 		     || test.version_name == "CXXABI_1.3.15"
 		     || test.version_name == "CXXABI_FLOAT128"
 		     || test.version_name == "CXXABI_TM_1");