Skip to content

Commit 1defe74

Browse files
committed
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.
1 parent b262b17 commit 1defe74

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

libstdc++-v3/config/abi/pre/gnu.ver

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,13 +2516,18 @@ GLIBCXX_3.4.31 {
25162516

25172517
} GLIBCXX_3.4.30;
25182518

2519+
# GCC 13.2.0
25192520
GLIBCXX_3.4.32 {
25202521
_ZSt21ios_base_library_initv;
25212522
_ZNSt7__cxx1112basic_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE11_S_allocateERS3_[jmy];
2522-
# std::basic_file<>::native_handle()
2523-
_ZNKSt12__basic_fileI[cw]E13native_handleEv;
25242523
} GLIBCXX_3.4.31;
25252524

2525+
# GCC 14.1.0
2526+
GLIBCXX_3.4.33 {
2527+
# std::basic_file<char>::native_handle()
2528+
_ZNKSt12__basic_fileIcE13native_handleEv;
2529+
} GLIBCXX_3.4.32;
2530+
25262531
# Symbols in the support library (libsupc++) have their own tag.
25272532
CXXABI_1.3 {
25282533

libstdc++-v3/testsuite/util/testsuite_abi.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ check_version(symbol& test, bool added)
214214
known_versions.push_back("GLIBCXX_3.4.30");
215215
known_versions.push_back("GLIBCXX_3.4.31");
216216
known_versions.push_back("GLIBCXX_3.4.32");
217+
known_versions.push_back("GLIBCXX_3.4.33");
217218
known_versions.push_back("GLIBCXX_LDBL_3.4.31");
218219
known_versions.push_back("GLIBCXX_IEEE128_3.4.29");
219220
known_versions.push_back("GLIBCXX_IEEE128_3.4.30");
@@ -253,7 +254,7 @@ check_version(symbol& test, bool added)
253254
test.version_status = symbol::incompatible;
254255

255256
// Check that added symbols are added in the latest pre-release version.
256-
bool latestp = (test.version_name == "GLIBCXX_3.4.32"
257+
bool latestp = (test.version_name == "GLIBCXX_3.4.33"
257258
|| test.version_name == "CXXABI_1.3.15"
258259
|| test.version_name == "CXXABI_FLOAT128"
259260
|| test.version_name == "CXXABI_TM_1");

0 commit comments

Comments
 (0)