Revert "libstdc++: Export global iostreams with GLIBCXX_3.4.31 symver [PR108969]"

This reverts commit 762be0646bf96761ce68a9e06ab60c453e0963d0.

diff --git a/libstdc++-v3/config/abi/post/aarch64-linux-gnu/baseline_symbols.txt b/libstdc++-v3/config/abi/post/aarch64-linux-gnu/baseline_symbols.txt
index d2cf0d4..9be3453 100644 (file)
--- a/libstdc++-v3/config/abi/post/aarch64-linux-gnu/baseline_symbols.txt
+++ b/libstdc++-v3/config/abi/post/aarch64-linux-gnu/baseline_symbols.txt
@@ -5258,23 +5258,15 @@ OBJECT:25:_ZTSNSt7__cxx118numpunctIcEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSNSt7__cxx118numpunctIwEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSSt20bad_array_new_length@@CXXABI_1.3.8
 OBJECT:26:_ZTSNSt3pmr15memory_resourceE@@GLIBCXX_3.4.28
-OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cerr@GLIBCXX_3.4
-OBJECT:272:_ZSt4clog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4clog@GLIBCXX_3.4
-OBJECT:272:_ZSt4cout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cout@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcerr@GLIBCXX_3.4
-OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wclog@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcout@GLIBCXX_3.4
+OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt4clog@@GLIBCXX_3.4
+OBJECT:272:_ZSt4cout@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4
 OBJECT:27:_ZTSSt19__codecvt_utf8_baseIwE@@GLIBCXX_3.4.21
-OBJECT:280:_ZSt3cin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt3cin@GLIBCXX_3.4
-OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt4wcin@GLIBCXX_3.4
+OBJECT:280:_ZSt3cin@@GLIBCXX_3.4
+OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDiE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDsE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt20__codecvt_utf16_baseIwE@@GLIBCXX_3.4.21

diff --git a/libstdc++-v3/config/abi/post/i486-linux-gnu/baseline_symbols.txt b/libstdc++-v3/config/abi/post/i486-linux-gnu/baseline_symbols.txt
index 3543637..ed8966b 100644 (file)
--- a/libstdc++-v3/config/abi/post/i486-linux-gnu/baseline_symbols.txt
+++ b/libstdc++-v3/config/abi/post/i486-linux-gnu/baseline_symbols.txt
@@ -4769,22 +4769,14 @@ OBJECT:13:_ZTSSt9exception@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9strstream@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9time_base@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9type_info@@GLIBCXX_3.4
-OBJECT:140:_ZSt4cerr@@GLIBCXX_3.4.31
-OBJECT:140:_ZSt4cerr@GLIBCXX_3.4
-OBJECT:140:_ZSt4clog@@GLIBCXX_3.4.31
-OBJECT:140:_ZSt4clog@GLIBCXX_3.4
-OBJECT:140:_ZSt4cout@@GLIBCXX_3.4.31
-OBJECT:140:_ZSt4cout@GLIBCXX_3.4
-OBJECT:144:_ZSt3cin@@GLIBCXX_3.4.31
-OBJECT:144:_ZSt3cin@GLIBCXX_3.4
-OBJECT:144:_ZSt5wcerr@@GLIBCXX_3.4.31
-OBJECT:144:_ZSt5wcerr@GLIBCXX_3.4
-OBJECT:144:_ZSt5wclog@@GLIBCXX_3.4.31
-OBJECT:144:_ZSt5wclog@GLIBCXX_3.4
-OBJECT:144:_ZSt5wcout@@GLIBCXX_3.4.31
-OBJECT:144:_ZSt5wcout@GLIBCXX_3.4
-OBJECT:148:_ZSt4wcin@@GLIBCXX_3.4.31
-OBJECT:148:_ZSt4wcin@GLIBCXX_3.4
+OBJECT:140:_ZSt4cerr@@GLIBCXX_3.4
+OBJECT:140:_ZSt4clog@@GLIBCXX_3.4
+OBJECT:140:_ZSt4cout@@GLIBCXX_3.4
+OBJECT:144:_ZSt3cin@@GLIBCXX_3.4
+OBJECT:144:_ZSt5wcerr@@GLIBCXX_3.4
+OBJECT:144:_ZSt5wclog@@GLIBCXX_3.4
+OBJECT:144:_ZSt5wcout@@GLIBCXX_3.4
+OBJECT:148:_ZSt4wcin@@GLIBCXX_3.4
 OBJECT:14:_ZTSSt7collateIcE@@GLIBCXX_3.4
 OBJECT:14:_ZTSSt7collateIwE@@GLIBCXX_3.4
 OBJECT:15:_ZTSSt10bad_typeid@@GLIBCXX_3.4

diff --git a/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt b/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt
index 865a4ce..be21567 100644 (file)
--- a/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt
+++ b/libstdc++-v3/config/abi/post/m68k-linux-gnu/baseline_symbols.txt
@@ -4759,27 +4759,19 @@ OBJECT:12:_ZTSSt5ctypeIcE@@GLIBCXX_3.4
 OBJECT:12:_ZTSSt5ctypeIwE@@GLIBCXX_3.4
 OBJECT:12:_ZTSSt8bad_cast@@GLIBCXX_3.4
 OBJECT:12:_ZTSSt8ios_base@@GLIBCXX_3.4
-OBJECT:138:_ZSt4cerr@@GLIBCXX_3.4.31
-OBJECT:138:_ZSt4cerr@GLIBCXX_3.4
-OBJECT:138:_ZSt4clog@@GLIBCXX_3.4.31
-OBJECT:138:_ZSt4clog@GLIBCXX_3.4
-OBJECT:138:_ZSt4cout@@GLIBCXX_3.4.31
-OBJECT:138:_ZSt4cout@GLIBCXX_3.4
+OBJECT:138:_ZSt4cerr@@GLIBCXX_3.4
+OBJECT:138:_ZSt4clog@@GLIBCXX_3.4
+OBJECT:138:_ZSt4cout@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9bad_alloc@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9exception@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9strstream@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9time_base@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9type_info@@GLIBCXX_3.4
-OBJECT:142:_ZSt3cin@@GLIBCXX_3.4.31
-OBJECT:142:_ZSt3cin@GLIBCXX_3.4
-OBJECT:142:_ZSt5wcerr@@GLIBCXX_3.4.31
-OBJECT:142:_ZSt5wcerr@GLIBCXX_3.4
-OBJECT:142:_ZSt5wclog@@GLIBCXX_3.4.31
-OBJECT:142:_ZSt5wclog@GLIBCXX_3.4
-OBJECT:142:_ZSt5wcout@@GLIBCXX_3.4.31
-OBJECT:142:_ZSt5wcout@GLIBCXX_3.4
-OBJECT:146:_ZSt4wcin@@GLIBCXX_3.4.31
-OBJECT:146:_ZSt4wcin@GLIBCXX_3.4
+OBJECT:142:_ZSt3cin@@GLIBCXX_3.4
+OBJECT:142:_ZSt5wcerr@@GLIBCXX_3.4
+OBJECT:142:_ZSt5wclog@@GLIBCXX_3.4
+OBJECT:142:_ZSt5wcout@@GLIBCXX_3.4
+OBJECT:146:_ZSt4wcin@@GLIBCXX_3.4
 OBJECT:14:_ZTSSt7collateIcE@@GLIBCXX_3.4
 OBJECT:14:_ZTSSt7collateIwE@@GLIBCXX_3.4
 OBJECT:15:_ZTSSt10bad_typeid@@GLIBCXX_3.4

diff --git a/libstdc++-v3/config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt b/libstdc++-v3/config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt
index 9b4ec71..f4ae6d4 100644 (file)
--- a/libstdc++-v3/config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt
+++ b/libstdc++-v3/config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt
@@ -5771,23 +5771,15 @@ OBJECT:25:_ZTSNSt7__cxx118numpunctIcEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSNSt7__cxx118numpunctIwEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSSt20bad_array_new_length@@CXXABI_1.3.8
 OBJECT:26:_ZTSNSt3pmr15memory_resourceE@@GLIBCXX_3.4.28
-OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cerr@GLIBCXX_3.4
-OBJECT:272:_ZSt4clog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4clog@GLIBCXX_3.4
-OBJECT:272:_ZSt4cout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cout@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcerr@GLIBCXX_3.4
-OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wclog@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcout@GLIBCXX_3.4
+OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt4clog@@GLIBCXX_3.4
+OBJECT:272:_ZSt4cout@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4
 OBJECT:27:_ZTSSt19__codecvt_utf8_baseIwE@@GLIBCXX_3.4.21
-OBJECT:280:_ZSt3cin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt3cin@GLIBCXX_3.4
-OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt4wcin@GLIBCXX_3.4
+OBJECT:280:_ZSt3cin@@GLIBCXX_3.4
+OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDiE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDsE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt20__codecvt_utf16_baseIwE@@GLIBCXX_3.4.21

diff --git a/libstdc++-v3/config/abi/post/riscv64-linux-gnu/baseline_symbols.txt b/libstdc++-v3/config/abi/post/riscv64-linux-gnu/baseline_symbols.txt
index ca7f366..876565b 100644 (file)
--- a/libstdc++-v3/config/abi/post/riscv64-linux-gnu/baseline_symbols.txt
+++ b/libstdc++-v3/config/abi/post/riscv64-linux-gnu/baseline_symbols.txt
@@ -5253,23 +5253,15 @@ OBJECT:25:_ZTSNSt7__cxx118numpunctIcEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSNSt7__cxx118numpunctIwEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSSt20bad_array_new_length@@CXXABI_1.3.8
 OBJECT:26:_ZTSNSt3pmr15memory_resourceE@@GLIBCXX_3.4.28
-OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cerr@GLIBCXX_3.4
-OBJECT:272:_ZSt4clog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4clog@GLIBCXX_3.4
-OBJECT:272:_ZSt4cout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cout@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcerr@GLIBCXX_3.4
-OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wclog@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcout@GLIBCXX_3.4
+OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt4clog@@GLIBCXX_3.4
+OBJECT:272:_ZSt4cout@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4
 OBJECT:27:_ZTSSt19__codecvt_utf8_baseIwE@@GLIBCXX_3.4.21
-OBJECT:280:_ZSt3cin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt3cin@GLIBCXX_3.4
-OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt4wcin@GLIBCXX_3.4
+OBJECT:280:_ZSt3cin@@GLIBCXX_3.4
+OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDiE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDsE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt20__codecvt_utf16_baseIwE@@GLIBCXX_3.4.21

diff --git a/libstdc++-v3/config/abi/post/s390x-linux-gnu/baseline_symbols.txt b/libstdc++-v3/config/abi/post/s390x-linux-gnu/baseline_symbols.txt
index 7be951d..5e53285 100644 (file)
--- a/libstdc++-v3/config/abi/post/s390x-linux-gnu/baseline_symbols.txt
+++ b/libstdc++-v3/config/abi/post/s390x-linux-gnu/baseline_symbols.txt
@@ -5534,22 +5534,14 @@ OBJECT:25:_ZTSNSt7__cxx118numpunctIcEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSNSt7__cxx118numpunctIwEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSSt20bad_array_new_length@@CXXABI_1.3.8
 OBJECT:26:_ZTSNSt3pmr15memory_resourceE@@GLIBCXX_3.4.28
-OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cerr@GLIBCXX_3.4
-OBJECT:272:_ZSt4clog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4clog@GLIBCXX_3.4
-OBJECT:272:_ZSt4cout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cout@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcerr@GLIBCXX_3.4
-OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wclog@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcout@GLIBCXX_3.4
-OBJECT:280:_ZSt3cin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt3cin@GLIBCXX_3.4
-OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt4wcin@GLIBCXX_3.4
+OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt4clog@@GLIBCXX_3.4
+OBJECT:272:_ZSt4cout@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4
+OBJECT:27:_ZTSSt19__codecvt_utf8_baseIwE@@GLIBCXX_3.4.21
+OBJECT:280:_ZSt3cin@@GLIBCXX_3.4
 OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDiE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDsE@@GLIBCXX_3.4.21

diff --git a/libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt b/libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt
index 3543637..ed8966b 100644 (file)
--- a/libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt
+++ b/libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt
@@ -4769,22 +4769,14 @@ OBJECT:13:_ZTSSt9exception@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9strstream@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9time_base@@GLIBCXX_3.4
 OBJECT:13:_ZTSSt9type_info@@GLIBCXX_3.4
-OBJECT:140:_ZSt4cerr@@GLIBCXX_3.4.31
-OBJECT:140:_ZSt4cerr@GLIBCXX_3.4
-OBJECT:140:_ZSt4clog@@GLIBCXX_3.4.31
-OBJECT:140:_ZSt4clog@GLIBCXX_3.4
-OBJECT:140:_ZSt4cout@@GLIBCXX_3.4.31
-OBJECT:140:_ZSt4cout@GLIBCXX_3.4
-OBJECT:144:_ZSt3cin@@GLIBCXX_3.4.31
-OBJECT:144:_ZSt3cin@GLIBCXX_3.4
-OBJECT:144:_ZSt5wcerr@@GLIBCXX_3.4.31
-OBJECT:144:_ZSt5wcerr@GLIBCXX_3.4
-OBJECT:144:_ZSt5wclog@@GLIBCXX_3.4.31
-OBJECT:144:_ZSt5wclog@GLIBCXX_3.4
-OBJECT:144:_ZSt5wcout@@GLIBCXX_3.4.31
-OBJECT:144:_ZSt5wcout@GLIBCXX_3.4
-OBJECT:148:_ZSt4wcin@@GLIBCXX_3.4.31
-OBJECT:148:_ZSt4wcin@GLIBCXX_3.4
+OBJECT:140:_ZSt4cerr@@GLIBCXX_3.4
+OBJECT:140:_ZSt4clog@@GLIBCXX_3.4
+OBJECT:140:_ZSt4cout@@GLIBCXX_3.4
+OBJECT:144:_ZSt3cin@@GLIBCXX_3.4
+OBJECT:144:_ZSt5wcerr@@GLIBCXX_3.4
+OBJECT:144:_ZSt5wclog@@GLIBCXX_3.4
+OBJECT:144:_ZSt5wcout@@GLIBCXX_3.4
+OBJECT:148:_ZSt4wcin@@GLIBCXX_3.4
 OBJECT:14:_ZTSSt7collateIcE@@GLIBCXX_3.4
 OBJECT:14:_ZTSSt7collateIwE@@GLIBCXX_3.4
 OBJECT:15:_ZTSSt10bad_typeid@@GLIBCXX_3.4

diff --git a/libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt b/libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt
index fc0d962..6d48d7b 100644 (file)
--- a/libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt
+++ b/libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt
@@ -5264,23 +5264,15 @@ OBJECT:25:_ZTSNSt7__cxx118numpunctIcEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSNSt7__cxx118numpunctIwEE@@GLIBCXX_3.4.21
 OBJECT:25:_ZTSSt20bad_array_new_length@@CXXABI_1.3.8
 OBJECT:26:_ZTSNSt3pmr15memory_resourceE@@GLIBCXX_3.4.28
-OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cerr@GLIBCXX_3.4
-OBJECT:272:_ZSt4clog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4clog@GLIBCXX_3.4
-OBJECT:272:_ZSt4cout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt4cout@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcerr@GLIBCXX_3.4
-OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wclog@GLIBCXX_3.4
-OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4.31
-OBJECT:272:_ZSt5wcout@GLIBCXX_3.4
+OBJECT:272:_ZSt4cerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt4clog@@GLIBCXX_3.4
+OBJECT:272:_ZSt4cout@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcerr@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wclog@@GLIBCXX_3.4
+OBJECT:272:_ZSt5wcout@@GLIBCXX_3.4
 OBJECT:27:_ZTSSt19__codecvt_utf8_baseIwE@@GLIBCXX_3.4.21
-OBJECT:280:_ZSt3cin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt3cin@GLIBCXX_3.4
-OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4.31
-OBJECT:280:_ZSt4wcin@GLIBCXX_3.4
+OBJECT:280:_ZSt3cin@@GLIBCXX_3.4
+OBJECT:280:_ZSt4wcin@@GLIBCXX_3.4
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDiE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt19__codecvt_utf8_baseIDsE@@GLIBCXX_3.4.21
 OBJECT:28:_ZTSSt20__codecvt_utf16_baseIwE@@GLIBCXX_3.4.21

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 7c01552..4ae6309 100644 (file)
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -2512,20 +2512,6 @@ GLIBCXX_3.4.31 {
     _ZNKSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEcvbEv;
     _ZNKSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEcvbEv;
 
-#if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \
-    && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \
-    && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
-    # See src/c++98/globals_io.cc
-    _ZSt3cin;
-    _ZSt4cout;
-    _ZSt4cerr;
-    _ZSt4clog;
-    _ZSt4wcin;
-    _ZSt5wcout;
-    _ZSt5wcerr;
-    _ZSt5wclog;
-#endif
-
 } GLIBCXX_3.4.30;
 
 # Symbols in the support library (libsupc++) have their own tag.

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 3229f90..5b9af41 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -122,7 +122,6 @@ cxx98_sources = \
        compatibility.cc \
        compatibility-debug_list.cc \
        compatibility-debug_list-2.cc \
-       globals_io.cc \
        ${ldbl_compat_sources}
 
 cxx11_sources = \

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index d145a7b..f42d957 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -151,7 +151,7 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @GLIBCXX_LDBL_COMPAT_TRUE@am__objects_1 = compatibility-ldbl.lo
 am__objects_2 = compatibility.lo compatibility-debug_list.lo \
-       compatibility-debug_list-2.lo globals_io.lo $(am__objects_1)
+       compatibility-debug_list-2.lo $(am__objects_1)
 @ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@am__objects_3 = compatibility-atomic-c++0x.lo \
 @ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@   compatibility-c++0x.lo \
 @ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@   compatibility-chrono.lo \
@@ -534,7 +534,6 @@ cxx98_sources = \
        compatibility.cc \
        compatibility-debug_list.cc \
        compatibility-debug_list-2.cc \
-       globals_io.cc \
        ${ldbl_compat_sources}
 
 cxx11_sources = \

diff --git a/libstdc++-v3/src/c++98/Makefile.am b/libstdc++-v3/src/c++98/Makefile.am
index 2570f90..284ffda 100644 (file)
--- a/libstdc++-v3/src/c++98/Makefile.am
+++ b/libstdc++-v3/src/c++98/Makefile.am
@@ -118,6 +118,7 @@ sources = \
        mt_allocator.cc \
        codecvt.cc \
        complex_io.cc \
+       globals_io.cc \
        hash_tr1.cc \
        hashtable_tr1.cc \
        ios_failure.cc \

diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in
index 627ebb8..a100df7 100644 (file)
--- a/libstdc++-v3/src/c++98/Makefile.in
+++ b/libstdc++-v3/src/c++98/Makefile.in
@@ -136,13 +136,14 @@ am__objects_5 = parallel_settings.lo
 am__objects_6 = basic_file.lo c++locale.lo $(am__objects_4) \
        $(am__objects_5)
 am__objects_7 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \
-       codecvt.lo complex_io.lo hash_tr1.lo hashtable_tr1.lo \
-       ios_failure.lo ios_init.lo ios_locale.lo list.lo list-aux.lo \
-       list-aux-2.lo list_associated.lo list_associated-2.lo \
-       locale.lo locale_init.lo locale_facets.lo localename.lo \
-       math_stubs_float.lo math_stubs_long_double.lo stdexcept.lo \
-       strstream.lo tree.lo istream.lo istream-string.lo streambuf.lo \
-       valarray.lo $(am__objects_1) $(am__objects_3) $(am__objects_6)
+       codecvt.lo complex_io.lo globals_io.lo hash_tr1.lo \
+       hashtable_tr1.lo ios_failure.lo ios_init.lo ios_locale.lo \
+       list.lo list-aux.lo list-aux-2.lo list_associated.lo \
+       list_associated-2.lo locale.lo locale_init.lo locale_facets.lo \
+       localename.lo math_stubs_float.lo math_stubs_long_double.lo \
+       stdexcept.lo strstream.lo tree.lo istream.lo istream-string.lo \
+       streambuf.lo valarray.lo $(am__objects_1) $(am__objects_3) \
+       $(am__objects_6)
 @GLIBCXX_HOSTED_TRUE@am_libc__98convenience_la_OBJECTS =  \
 @GLIBCXX_HOSTED_TRUE@  $(am__objects_7)
 libc__98convenience_la_OBJECTS = $(am_libc__98convenience_la_OBJECTS)
@@ -493,6 +494,7 @@ sources = \
        mt_allocator.cc \
        codecvt.cc \
        complex_io.cc \
+       globals_io.cc \
        hash_tr1.cc \
        hashtable_tr1.cc \
        ios_failure.cc \

diff --git a/libstdc++-v3/src/c++98/globals_io.cc b/libstdc++-v3/src/c++98/globals_io.cc
index ba9a103..0c4f270 100644 (file)
--- a/libstdc++-v3/src/c++98/globals_io.cc
+++ b/libstdc++-v3/src/c++98/globals_io.cc
@@ -43,22 +43,6 @@
 // In macro form:
 // _GLIBCXX_ASM_SYMVER(currentname, oldname, GLIBCXX_3.2)
 
-#if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \
-    && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \
-    && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
-// PR libstdc++/108969
-// Define std::cin as std::__io::cin and export it as std::cin@@GLIBCXX_3.4.31
-// and also as std::cin@GLIBCXX_3.4 for backwards compatibility.
-# define _GLIBCXX_IO_GLOBAL(type, X, N) \
-  namespace __io { \
-    type X __attribute__((symver("_ZSt" #N #X "@@GLIBCXX_3.4.31"))); \
-    extern type X ## 2 __attribute__((alias("_ZNSt4__io" #N #X "E"), \
-                                     symver("_ZSt" #N #X "@GLIBCXX_3.4"))); \
-  }
-#else
-# define _GLIBCXX_IO_GLOBAL(type, X, N) type X;
-#endif
-
 namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -69,20 +53,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   __attribute__ ((aligned(__alignof__(istream))));
   typedef char fake_ostream[sizeof(ostream)]
   __attribute__ ((aligned(__alignof__(ostream))));
-  _GLIBCXX_IO_GLOBAL(fake_istream, cin, 3);
-  _GLIBCXX_IO_GLOBAL(fake_ostream, cout, 4);
-  _GLIBCXX_IO_GLOBAL(fake_ostream, cerr, 4);
-  _GLIBCXX_IO_GLOBAL(fake_ostream, clog, 4);
+  fake_istream cin;
+  fake_ostream cout;
+  fake_ostream cerr;
+  fake_ostream clog;
 
 #ifdef _GLIBCXX_USE_WCHAR_T
   typedef char fake_wistream[sizeof(wistream)]
   __attribute__ ((aligned(__alignof__(wistream))));
   typedef char fake_wostream[sizeof(wostream)]
   __attribute__ ((aligned(__alignof__(wostream))));
-  _GLIBCXX_IO_GLOBAL(fake_wistream, wcin, 4)
-  _GLIBCXX_IO_GLOBAL(fake_wostream, wcout, 5)
-  _GLIBCXX_IO_GLOBAL(fake_wostream, wcerr, 5)
-  _GLIBCXX_IO_GLOBAL(fake_wostream, wclog, 5)
+  fake_wistream wcin;
+  fake_wostream wcout;
+  fake_wostream wcerr;
+  fake_wostream wclog;
 #endif
 
 #include "ios_base_init.h"