From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 28 Oct 2020 23:10:21 +0000 (+0000)
Subject: libstdc++: Fix linker script
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f4f9364d2074e027490c1b08956ac1cbd9617575;p=gcc.git

libstdc++: Fix linker script

libstdc++-v3/ChangeLog:

	* config/abi/pre/gnu.ver (GLIBCXX_3.4.29): Remove duplicate
	patterns.
	(CXXABI_1.3.13): Restore missing piece.
---

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 2648c813616..80994b203df 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -2335,51 +2335,6 @@ GLIBCXX_3.4.29 {
     # std::__throw_bad_array_new_length()
     _ZSt28__throw_bad_array_new_lengthv;
 
-    # basic_stringbuf::basic_stringbuf(allocator const&)
-    _ZNSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EEC1ERKS3_;
-
-    # basic_stringbuf::basic_stringbuf(ios_base::openmode, allocator const&)
-    _ZNSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EEC1ESt13_Ios_OpenmodeRKS3;
-
-    # basic_stringbuf::basic_stringbuf(basic_string&&, ios_base::openmode)
-    _ZNSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EEC1EONS_12basic_stringI[cw]S2_S3_EESt13_Ios_Openmode;
-
-    # basic_stringbuf::basic_stringbuf(basic_stringbuf&&, allocator const&)
-    _ZNSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaIcEEC1EOS4_RKS3_;
-
-    # basic_stringbuf::get_allocator()
-    _ZNKSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE13get_allocatorEv;
-
-    # basic_stringbuf::view()
-    _ZNKSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE4viewEv;
-
-    # basic_istringstream::basic_istringstream(basic_string&&, ios_base::openmode)
-    _ZNSt7__cxx1119basic_istringstreamI[cw]St11char_traitsI[cw]ESaIcEEC1EONS_12basic_stringI[cw]S2_S3_EESt13_Ios_Openmode;
-
-    # basic_istringstream::basic_istringstream(ios_base::openmode, allocator const&)
-    _ZNSt7__cxx1119basic_istringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EEC1ESt13_Ios_OpenmodeRKS3_;
-
-    # basic_istringstream::view()
-    _ZNKSt7__cxx1119basic_istringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE4viewEv;
-
-    # basic_ostringstream::basic_ostringstream(basic_string&&, ios_base::openmode)
-    _ZNSt7__cxx1119basic_ostringstreamI[cw]St11char_traitsI[cw]ESaIcEEC1EONS_12basic_stringI[cw]S2_S3_EESt13_Ios_Openmode;
-
-    # basic_ostringstream::basic_ostringstream(ios_base::openmode, allocator const&)
-    _ZNSt7__cxx1119basic_ostringstreamI[cw]St11char_traitsI[cw]ESaIcEEC1ESt13_Ios_OpenmodeRKS3_;
-
-    # basic_ostringstream::view()
-    _ZNKSt7__cxx1119basic_ostringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE4viewEv;
-
-    # basic_stringstream::basic_stringstream(basic_string&&, ios_base::openmode)
-    _ZNSt7__cxx1119basic_stringstreamI[cw]St11char_traitsI[cw]ESaIcEEC1EONS_12basic_stringI[cw]S2_S3_EESt13_Ios_Openmode;
-
-    # basic_stringstream::basic_stringstream(ios_base::openmode, allocator const&)
-    _ZNSt7__cxx1119basic_stringstreamI[cw]St11char_traitsI[cw]ESaIcEEC1ESt13_Ios_OpenmodeRKS3_;
-
-    # basic_stringstream::view()
-    _ZNKSt7__cxx1119basic_stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE4viewEv;
-
     # basic_stringbuf::basic_stringbuf(allocator const&)
     _ZNSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EEC[12]ERKS3_;
 
@@ -2398,13 +2353,13 @@ GLIBCXX_3.4.29 {
     # basic_stringbuf::view()
     _ZNKSt7__cxx1115basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE4viewEv;
 
-    # basic_istringstream::basic_istringstream(basic_string&&, ios_base::openmode)
+    # basic_[io]stringstream::basic_[io]stringstream(basic_string&&, ios_base::openmode)
     _ZNSt7__cxx1119basic_[io]stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EEC[12]EONS_12basic_stringI[cw]S2_S3_EESt13_Ios_Openmode;
 
     # basic_[io]stringstream::basic_[io]stringstream(ios_base::openmode, allocator const&)
     _ZNSt7__cxx1119basic_[io]stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EEC[12]ESt13_Ios_OpenmodeRKS3_;
 
-    # basic_istringstream::view()
+    # basic_[io]stringstream::view()
     _ZNKSt7__cxx1119basic_[io]stringstreamI[cw]St11char_traitsI[cw]ESaI[cw]EE4viewEv;
 
     # basic_stringstream::basic_stringstream(basic_string&&, ios_base::openmode)
@@ -2716,6 +2671,15 @@ CXXABI_1.3.12 {
 
 } CXXABI_1.3.11;
 
+CXXABI_1.3.13 {
+
+    # std::exception_ptr::_M_addref()
+    _ZNSt15__exception_ptr13exception_ptr9_M_addrefEv;
+    # std::exception_ptr::_M_release()
+    _ZNSt15__exception_ptr13exception_ptr10_M_releaseEv;
+
+} CXXABI_1.3.12;
+
 # Symbols in the support library (libsupc++) supporting transactional memory.
 CXXABI_TM_1 {