diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index eb5cffcac78..367181d76c5 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -3857,7 +3857,7 @@ case $enable_symvers in
[Define to use GNU versioning in the shared library.])
;;
gnu-versioned-namespace)
- libtool_VERSION=8:0:0
+ libtool_VERSION=9:0:0
SYMVER_FILE=config/abi/pre/gnu-versioned-namespace.ver
AC_DEFINE(_GLIBCXX_SYMVER_GNU_NAMESPACE, 1,
[Define to use GNU namespace versioning in the shared library.])
diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
index 06ccaa80a58..d82077a3cfa 100644
--- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
+++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
@@ -19,7 +19,7 @@
## with this library; see the file COPYING3. If not see
## .
-GLIBCXX_8.0 {
+GLIBCXX_9.0 {
global:
@@ -27,7 +27,7 @@ GLIBCXX_8.0 {
extern "C++"
{
std::*;
- std::__8::*;
+ std::__9::*;
};
# operator new(size_t)
@@ -59,7 +59,7 @@ GLIBCXX_8.0 {
# vtable
_ZTVSt*;
_ZTVNSt*;
- _ZTVN9__gnu_cxx3__818stdio_sync_filebufI[cw]NSt3__811char_traitsI[cw]EEEE;
+ _ZTVN9__gnu_cxx3__918stdio_sync_filebufI[cw]NSt3__911char_traitsI[cw]EEEE;
# thunk
_ZTv0_n12_NS*;
@@ -74,43 +74,43 @@ GLIBCXX_8.0 {
_ZTSNSt*;
# locale
- _ZNSt3__89has_facetINS_*;
+ _ZNSt3__99has_facetINS_*;
# thread/mutex/condition_variable/future
__once_proxy;
# std::__convert_to_v
- _ZNSt3__814__convert_to_v*;
+ _ZNSt3__914__convert_to_v*;
# std::__copy_streambufs
- _ZNSt3__817__copy_streambufsI*;
- _ZNSt3__821__copy_streambufs_eofI*;
+ _ZNSt3__917__copy_streambufsI*;
+ _ZNSt3__921__copy_streambufs_eofI*;
# std::__istream_extract(wistream&, wchar_t*, streamsize)
- _ZNSt3__817__istream_extractIwNS_11char_traitsIwEEEEvRNS_13basic_istreamIT_T0_EEPS4_[ilx];
+ _ZNSt3__917__istream_extractIwNS_11char_traitsIwEEEEvRNS_13basic_istreamIT_T0_EEPS4_[ilx];
# __gnu_cxx::__atomic_add
# __gnu_cxx::__exchange_and_add
- _ZN9__gnu_cxx3__812__atomic_addEPV[il][il];
- _ZN9__gnu_cxx3__818__exchange_and_addEPV[li][il];
+ _ZN9__gnu_cxx3__912__atomic_addEPV[il][il];
+ _ZN9__gnu_cxx3__918__exchange_and_addEPV[li][il];
# __gnu_cxx::__pool
- _ZN9__gnu_cxx3__86__poolILb[01]EE13_M_initializeEv;
- _ZN9__gnu_cxx3__86__poolILb[01]EE16_M_reserve_blockE[jmy][jmy];
- _ZN9__gnu_cxx3__86__poolILb[01]EE16_M_reclaim_blockEPc[jmy];
- _ZN9__gnu_cxx3__86__poolILb[01]EE10_M_destroyEv;
- _ZN9__gnu_cxx3__86__poolILb1EE16_M_get_thread_idEv;
+ _ZN9__gnu_cxx3__96__poolILb[01]EE13_M_initializeEv;
+ _ZN9__gnu_cxx3__96__poolILb[01]EE16_M_reserve_blockE[jmy][jmy];
+ _ZN9__gnu_cxx3__96__poolILb[01]EE16_M_reclaim_blockEPc[jmy];
+ _ZN9__gnu_cxx3__96__poolILb[01]EE10_M_destroyEv;
+ _ZN9__gnu_cxx3__96__poolILb1EE16_M_get_thread_idEv;
- _ZN9__gnu_cxx3__817__pool_alloc_base9_M_refillE[jmy];
- _ZN9__gnu_cxx3__817__pool_alloc_base16_M_get_free_listE[jmy];
- _ZN9__gnu_cxx3__817__pool_alloc_base12_M_get_mutexEv;
+ _ZN9__gnu_cxx3__917__pool_alloc_base9_M_refillE[jmy];
+ _ZN9__gnu_cxx3__917__pool_alloc_base16_M_get_free_listE[jmy];
+ _ZN9__gnu_cxx3__917__pool_alloc_base12_M_get_mutexEv;
- _ZN9__gnu_cxx3__89free_list6_M_getE[jmy];
- _ZN9__gnu_cxx3__89free_list8_M_clearEv;
+ _ZN9__gnu_cxx3__99free_list6_M_getE[jmy];
+ _ZN9__gnu_cxx3__99free_list8_M_clearEv;
# __gnu_cxx::stdio_sync_filebuf
- _ZTVN9__gnu_cxx3__818stdio_sync_filebufI[cw]St3__811char_traitsI[cw]EEE;
- _ZN9__gnu_cxx3__818stdio_sync_filebufI[cw]NSt3__811char_traitsI[cw]EEE[5-9]*;
+ _ZTVN9__gnu_cxx3__918stdio_sync_filebufI[cw]St3__911char_traitsI[cw]EEE;
+ _ZN9__gnu_cxx3__918stdio_sync_filebufI[cw]NSt3__911char_traitsI[cw]EEE[5-9]*;
# debug mode
_ZN11__gnu_debug19_Safe_sequence_base12_M_get_mutexEv;
@@ -236,7 +236,7 @@ CXXABI_2.0 {
_ZSt15_Fnv_hash_bytesPKv*;
# __gnu_cxx::_verbose_terminate_handler()
- _ZN9__gnu_cxx3__827__verbose_terminate_handlerEv;
+ _ZN9__gnu_cxx3__927__verbose_terminate_handlerEv;
# *_type_info classes, ctor and dtor
_ZN10__cxxabiv117__array_type_info*;
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index b47a379e201..9779ce0222b 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -68684,7 +68684,7 @@ $as_echo "#define _GLIBCXX_SYMVER_GNU 1" >>confdefs.h
;;
gnu-versioned-namespace)
- libtool_VERSION=8:0:0
+ libtool_VERSION=9:0:0
SYMVER_FILE=config/abi/pre/gnu-versioned-namespace.ver
$as_echo "#define _GLIBCXX_SYMVER_GNU_NAMESPACE 1" >>confdefs.h
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 2e9ff1a5ba2..04ba2240f9e 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -330,7 +330,7 @@ namespace std
#if _GLIBCXX_INLINE_VERSION
// Inline namespace for symbol versioning of (nearly) everything in std.
-# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __8 {
+# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __9 {
# define _GLIBCXX_END_NAMESPACE_VERSION }
// Unused when everything in std is versioned anyway.
# define _GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE(X)
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 5fe08ee0adc..fcedff08d5c 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -100,7 +100,7 @@ def find_type(orig, name):
else:
raise ValueError("Cannot find type %s::%s" % (str(orig), name))
-_versioned_namespace = '__8::'
+_versioned_namespace = '__9::'
def lookup_templ_spec(templ, *args):
"""
diff --git a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
index 830b30eae6c..a78935775c2 100644
--- a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
@@ -50,7 +50,7 @@ void test02()
// Ignore the reasons for deduction/substitution failure in the headers.
// Arrange for the match to work on installed trees as well as build trees.
-// { dg-prune-output "no type named 'type' in 'struct std::(__8::)?result_of" }
+// { dg-prune-output "no type named 'type' in 'struct std::result_of" }
int main()
{
diff --git a/libstdc++-v3/testsuite/20_util/function/cons/70692.cc b/libstdc++-v3/testsuite/20_util/function/cons/70692.cc
index b15208a2531..26324d3f078 100644
--- a/libstdc++-v3/testsuite/20_util/function/cons/70692.cc
+++ b/libstdc++-v3/testsuite/20_util/function/cons/70692.cc
@@ -11,4 +11,4 @@ int main()
std::function ff(f); // { dg-error "no matching function" }
std::function f2(f); // { dg-error "no matching function" }
}
-// { dg-error "std::(__8::)?enable_if" "" { target *-*-* } 0 }
+// { dg-error "std::(__9::)?enable_if" "" { target *-*-* } 0 }
diff --git a/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc
index cc7ad160162..53aceb633c1 100644
--- a/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc
@@ -29,8 +29,8 @@ test01()
c2.find(2); // { dg-error "here" }
}
-// { dg-error "_Compare = std::(__8::)?less" "" { target *-*-* } 0 }
-// { dg-error "_Compare = std::(__8::)?allocator" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__9::)?less" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__9::)?allocator" "" { target *-*-* } 0 }
// { dg-error "comparison object must be invocable" "" { target *-*-* } 0 }
// { dg-prune-output "no match for call" }
// { dg-prune-output "invalid conversion" }
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc
index 8bb69ec3e9d..cbb9583a548 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc
@@ -29,8 +29,8 @@ test01()
c2.find(2); // { dg-error "here" }
}
-// { dg-error "_Compare = std::(__8::)?less" "" { target *-*-* } 0 }
-// { dg-error "_Compare = std::(__8::)?allocator" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__9::)?less" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__9::)?allocator" "" { target *-*-* } 0 }
// { dg-error "comparison object must be invocable" "" { target *-*-* } 0 }
// { dg-prune-output "no match for call" }
// { dg-prune-output "invalid conversion" }
diff --git a/libstdc++-v3/testsuite/lib/prune.exp b/libstdc++-v3/testsuite/lib/prune.exp
index 74842ae680c..70b86eb3473 100644
--- a/libstdc++-v3/testsuite/lib/prune.exp
+++ b/libstdc++-v3/testsuite/lib/prune.exp
@@ -37,7 +37,7 @@ proc libstdc++-dg-prune { system text } {
return "::unsupported::hosted C++ headers not supported"
}
- regsub -all "std::__8::" $text "std::" text
+ regsub -all "std::__9::" $text "std::" text
# Ignore caret diagnostics. Unfortunately dejaGNU trims leading
# spaces, so one cannot rely on them being present.