Bump version namespace.
2017-05-10 François Dumont <fdumont@gcc.gnu.org> Bump version namespace. * config/abi/pre/gnu-versioned-namespace.ver: Bump version namespace from __7 to __8. Bump GLIBCXX_7.0 to GLIBCXX_8.0. * acinclude.m4 (libtool_VERSION): Bump to 8:0:0. * include/bits/c++config: Adapt. * include/bits/regex.h: Adapt. * include/experimental/bits/fs_fwd.h: Adapt. * include/experimental/bits/lfts_config.h: Adapt. * include/std/variant: Adapt. * python/libstdcxx/v6/printers.py: Adapt. * testsuite/libstdc++-prettyprinters/48362.cc: Adapt. * include/bits/stl_tree.h (_Rb_tree_impl<>): Remove _Is_pod_comparator template parameter when version namespace is active. From-SVN: r247858
This commit is contained in:
parent
dd54ca5649
commit
87c7063d68
|
@ -1,5 +1,19 @@
|
|||
2017-05-10 François Dumont <fdumont@gcc.gnu.org>
|
||||
|
||||
Bump version namespace.
|
||||
* config/abi/pre/gnu-versioned-namespace.ver: Bump version namespace
|
||||
from __7 to __8. Bump GLIBCXX_7.0 to GLIBCXX_8.0.
|
||||
* acinclude.m4 (libtool_VERSION): Bump to 8:0:0.
|
||||
* include/bits/c++config: Adapt.
|
||||
* include/bits/regex.h: Adapt.
|
||||
* include/experimental/bits/fs_fwd.h: Adapt.
|
||||
* include/experimental/bits/lfts_config.h: Adapt.
|
||||
* include/std/variant: Adapt.
|
||||
* python/libstdcxx/v6/printers.py: Adapt.
|
||||
* testsuite/libstdc++-prettyprinters/48362.cc: Adapt.
|
||||
* include/bits/stl_tree.h (_Rb_tree_impl<>): Remove _Is_pod_comparator
|
||||
template parameter when version namespace is active.
|
||||
|
||||
* include/bits/stl_algobase.h (std::__iter_swap<false>): Remove
|
||||
_GLIBCXX_MOVE usage.
|
||||
|
||||
|
|
|
@ -3763,7 +3763,7 @@ case $enable_symvers in
|
|||
[Define to use GNU versioning in the shared library.])
|
||||
;;
|
||||
gnu-versioned-namespace)
|
||||
libtool_VERSION=7:0:0
|
||||
libtool_VERSION=8: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.])
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
## with this library; see the file COPYING3. If not see
|
||||
## <http://www.gnu.org/licenses/>.
|
||||
|
||||
GLIBCXX_7.0 {
|
||||
GLIBCXX_8.0 {
|
||||
|
||||
global:
|
||||
|
||||
|
@ -27,7 +27,7 @@ GLIBCXX_7.0 {
|
|||
extern "C++"
|
||||
{
|
||||
std::*;
|
||||
std::__7::*;
|
||||
std::__8::*;
|
||||
std::random_device::*
|
||||
};
|
||||
|
||||
|
@ -60,7 +60,7 @@ GLIBCXX_7.0 {
|
|||
# vtable
|
||||
_ZTVSt*;
|
||||
_ZTVNSt*;
|
||||
_ZTVN9__gnu_cxx3__718stdio_sync_filebufI[cw]NSt3__711char_traitsI[cw]EEEE;
|
||||
_ZTVN9__gnu_cxx3__818stdio_sync_filebufI[cw]NSt3__811char_traitsI[cw]EEEE;
|
||||
|
||||
# thunk
|
||||
_ZTv0_n12_NS*;
|
||||
|
@ -75,51 +75,51 @@ GLIBCXX_7.0 {
|
|||
_ZTSNSt*;
|
||||
|
||||
# locale
|
||||
_ZNSt3__79has_facetINS_*;
|
||||
_ZNSt3__89has_facetINS_*;
|
||||
|
||||
# hash
|
||||
_ZNSt8__detail3__712__prime_listE;
|
||||
_ZNSt3tr18__detail3__712__prime_listE;
|
||||
_ZNSt8__detail3__812__prime_listE;
|
||||
_ZNSt3tr18__detail3__812__prime_listE;
|
||||
|
||||
# thread/mutex/condition_variable/future
|
||||
__once_proxy;
|
||||
|
||||
# std::__detail::_List_node_base
|
||||
_ZNSt8__detail3__715_List_node_base7_M_hook*;
|
||||
_ZNSt8__detail3__715_List_node_base9_M_unhookEv;
|
||||
_ZNSt8__detail3__715_List_node_base10_M_reverseEv;
|
||||
_ZNSt8__detail3__715_List_node_base11_M_transfer*;
|
||||
_ZNSt8__detail3__715_List_node_base4swapER*;
|
||||
_ZNSt8__detail3__815_List_node_base7_M_hook*;
|
||||
_ZNSt8__detail3__815_List_node_base9_M_unhookEv;
|
||||
_ZNSt8__detail3__815_List_node_base10_M_reverseEv;
|
||||
_ZNSt8__detail3__815_List_node_base11_M_transfer*;
|
||||
_ZNSt8__detail3__815_List_node_base4swapER*;
|
||||
|
||||
# std::__convert_to_v
|
||||
_ZNSt3__714__convert_to_v*;
|
||||
_ZNSt3__814__convert_to_v*;
|
||||
|
||||
# std::__copy_streambufs
|
||||
_ZNSt3__717__copy_streambufsI*;
|
||||
_ZNSt3__721__copy_streambufs_eofI*;
|
||||
_ZNSt3__817__copy_streambufsI*;
|
||||
_ZNSt3__821__copy_streambufs_eofI*;
|
||||
|
||||
# __gnu_cxx::__atomic_add
|
||||
# __gnu_cxx::__exchange_and_add
|
||||
_ZN9__gnu_cxx3__712__atomic_addEPV[il][il];
|
||||
_ZN9__gnu_cxx3__718__exchange_and_addEPV[li][il];
|
||||
_ZN9__gnu_cxx3__812__atomic_addEPV[il][il];
|
||||
_ZN9__gnu_cxx3__818__exchange_and_addEPV[li][il];
|
||||
|
||||
# __gnu_cxx::__pool
|
||||
_ZN9__gnu_cxx3__76__poolILb[01]EE13_M_initializeEv;
|
||||
_ZN9__gnu_cxx3__76__poolILb[01]EE16_M_reserve_blockE[jmy][jmy];
|
||||
_ZN9__gnu_cxx3__76__poolILb[01]EE16_M_reclaim_blockEPc[jmy];
|
||||
_ZN9__gnu_cxx3__76__poolILb[01]EE10_M_destroyEv;
|
||||
_ZN9__gnu_cxx3__76__poolILb1EE16_M_get_thread_idEv;
|
||||
_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__717__pool_alloc_base9_M_refillE[jmy];
|
||||
_ZN9__gnu_cxx3__717__pool_alloc_base16_M_get_free_listE[jmy];
|
||||
_ZN9__gnu_cxx3__717__pool_alloc_base12_M_get_mutexEv;
|
||||
_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__79free_list6_M_getE[jmy];
|
||||
_ZN9__gnu_cxx3__79free_list8_M_clearEv;
|
||||
_ZN9__gnu_cxx3__89free_list6_M_getE[jmy];
|
||||
_ZN9__gnu_cxx3__89free_list8_M_clearEv;
|
||||
|
||||
# __gnu_cxx::stdio_sync_filebuf
|
||||
_ZTVN9__gnu_cxx3__718stdio_sync_filebufI[cw]St3__711char_traitsI[cw]EEE;
|
||||
_ZN9__gnu_cxx3__718stdio_sync_filebufI[cw]NSt3__711char_traitsI[cw]EEE[5-9]*;
|
||||
_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]*;
|
||||
|
||||
# debug mode
|
||||
_ZN11__gnu_debug19_Safe_sequence_base12_M_get_mutexEv;
|
||||
|
@ -249,7 +249,7 @@ CXXABI_2.0 {
|
|||
_ZSt15_Fnv_hash_bytesPKv*;
|
||||
|
||||
# __gnu_cxx::_verbose_terminate_handler()
|
||||
_ZN9__gnu_cxx3__727__verbose_terminate_handlerEv;
|
||||
_ZN9__gnu_cxx3__827__verbose_terminate_handlerEv;
|
||||
|
||||
# *_type_info classes, ctor and dtor
|
||||
_ZN10__cxxabiv117__array_type_info*;
|
||||
|
|
|
@ -276,55 +276,55 @@ namespace __gnu_cxx
|
|||
|
||||
namespace std
|
||||
{
|
||||
inline namespace __7 { }
|
||||
inline namespace __8 { }
|
||||
|
||||
namespace rel_ops { inline namespace __7 { } }
|
||||
namespace rel_ops { inline namespace __8 { } }
|
||||
|
||||
namespace tr1
|
||||
{
|
||||
inline namespace __7 { }
|
||||
namespace placeholders { inline namespace __7 { } }
|
||||
namespace regex_constants { inline namespace __7 { } }
|
||||
namespace __detail { inline namespace __7 { } }
|
||||
inline namespace __8 { }
|
||||
namespace placeholders { inline namespace __8 { } }
|
||||
namespace regex_constants { inline namespace __8 { } }
|
||||
namespace __detail { inline namespace __8 { } }
|
||||
}
|
||||
|
||||
namespace tr2
|
||||
{ inline namespace __7 { } }
|
||||
{ inline namespace __8 { } }
|
||||
|
||||
namespace decimal { inline namespace __7 { } }
|
||||
namespace decimal { inline namespace __8 { } }
|
||||
|
||||
#if __cplusplus >= 201103L
|
||||
namespace chrono { inline namespace __7 { } }
|
||||
namespace placeholders { inline namespace __7 { } }
|
||||
namespace regex_constants { inline namespace __7 { } }
|
||||
namespace this_thread { inline namespace __7 { } }
|
||||
namespace chrono { inline namespace __8 { } }
|
||||
namespace placeholders { inline namespace __8 { } }
|
||||
namespace regex_constants { inline namespace __8 { } }
|
||||
namespace this_thread { inline namespace __8 { } }
|
||||
|
||||
#if __cplusplus >= 201402L
|
||||
inline namespace literals {
|
||||
inline namespace chrono_literals { inline namespace __7 { } }
|
||||
inline namespace complex_literals { inline namespace __7 { } }
|
||||
inline namespace string_literals { inline namespace __7 { } }
|
||||
inline namespace chrono_literals { inline namespace __8 { } }
|
||||
inline namespace complex_literals { inline namespace __8 { } }
|
||||
inline namespace string_literals { inline namespace __8 { } }
|
||||
#if __cplusplus > 201402L
|
||||
inline namespace string_view_literals { inline namespace __7 { } }
|
||||
inline namespace string_view_literals { inline namespace __8 { } }
|
||||
#endif // C++17
|
||||
}
|
||||
#endif // C++14
|
||||
#endif // C++11
|
||||
|
||||
namespace __detail {
|
||||
inline namespace __7 { }
|
||||
inline namespace __8 { }
|
||||
#if __cplusplus > 201402L
|
||||
namespace __variant { inline namespace __7 { } }
|
||||
namespace __variant { inline namespace __8 { } }
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
namespace __gnu_cxx
|
||||
{
|
||||
inline namespace __7 { }
|
||||
namespace __detail { inline namespace __7 { } }
|
||||
inline namespace __8 { }
|
||||
namespace __detail { inline namespace __8 { } }
|
||||
}
|
||||
# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __7 {
|
||||
# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __8 {
|
||||
# define _GLIBCXX_END_NAMESPACE_VERSION }
|
||||
#else
|
||||
# define _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
|
@ -341,7 +341,7 @@ namespace std
|
|||
namespace __cxx1998
|
||||
{
|
||||
# if _GLIBCXX_INLINE_VERSION
|
||||
inline namespace __7 { }
|
||||
inline namespace __8 { }
|
||||
# endif
|
||||
|
||||
# if _GLIBCXX_USE_CXX11_ABI
|
||||
|
|
|
@ -773,7 +773,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
|
|||
__detail::_RegexExecutorPolicy, bool>
|
||||
friend bool __detail::
|
||||
#if _GLIBCXX_INLINE_VERSION
|
||||
__7:: // Required due to PR c++/59256
|
||||
__8:: // Required due to PR c++/59256
|
||||
#endif
|
||||
__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
|
||||
const basic_regex<_Cp, _Rp>&,
|
||||
|
@ -1867,7 +1867,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
|
|||
__detail::_RegexExecutorPolicy, bool>
|
||||
friend bool __detail::
|
||||
#if _GLIBCXX_INLINE_VERSION
|
||||
__7:: // Required due to PR c++/59256
|
||||
__8:: // Required due to PR c++/59256
|
||||
#endif
|
||||
__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
|
||||
const basic_regex<_Cp, _Rp>&,
|
||||
|
|
|
@ -47,7 +47,7 @@ namespace filesystem
|
|||
inline namespace v1
|
||||
{
|
||||
#if _GLIBCXX_INLINE_VERSION
|
||||
inline namespace __7 { }
|
||||
inline namespace __8 { }
|
||||
#endif
|
||||
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
|
||||
|
|
|
@ -39,24 +39,24 @@ namespace chrono
|
|||
{
|
||||
namespace experimental
|
||||
{
|
||||
inline namespace fundamentals_v1 { inline namespace __7 { } }
|
||||
inline namespace fundamentals_v2 { inline namespace __7 { } }
|
||||
inline namespace fundamentals_v1 { inline namespace __8 { } }
|
||||
inline namespace fundamentals_v2 { inline namespace __8 { } }
|
||||
} // namespace experimental
|
||||
} // namespace chrono
|
||||
|
||||
namespace experimental
|
||||
{
|
||||
inline namespace fundamentals_v1 {
|
||||
inline namespace __7 { }
|
||||
namespace __detail { inline namespace __7 { } }
|
||||
inline namespace __8 { }
|
||||
namespace __detail { inline namespace __8 { } }
|
||||
}
|
||||
inline namespace fundamentals_v2 {
|
||||
inline namespace __7 { }
|
||||
namespace pmr { inline namespace __7 { } }
|
||||
namespace __detail { inline namespace __7 { } }
|
||||
inline namespace __8 { }
|
||||
namespace pmr { inline namespace __8 { } }
|
||||
namespace __detail { inline namespace __8 { } }
|
||||
} // namespace fundamentals_v2
|
||||
inline namespace literals { inline namespace string_view_literals {
|
||||
inline namespace __7 { }
|
||||
inline namespace __8 { }
|
||||
} } // namespace literals::string_view_literals
|
||||
} // namespace experimental
|
||||
} // namespace std
|
||||
|
|
|
@ -1154,14 +1154,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
template<size_t _Np, typename _Vp>
|
||||
friend constexpr decltype(auto) __detail::__variant::
|
||||
#if _GLIBCXX_INLINE_VERSION
|
||||
__7:: // Required due to PR c++/59256
|
||||
__8:: // Required due to PR c++/59256
|
||||
#endif
|
||||
__get(_Vp&& __v);
|
||||
|
||||
template<typename _Vp>
|
||||
friend void* __detail::__variant::
|
||||
#if _GLIBCXX_INLINE_VERSION
|
||||
__7:: // Required due to PR c++/59256
|
||||
__8:: // Required due to PR c++/59256
|
||||
#endif
|
||||
__get_storage(_Vp&& __v);
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@ def find_type(orig, name):
|
|||
raise ValueError("Cannot find type %s::%s" % (str(orig), name))
|
||||
typ = field.type
|
||||
|
||||
_versioned_namespace = '__7::'
|
||||
_versioned_namespace = '__8::'
|
||||
|
||||
# Test if a type is a given template instantiation.
|
||||
def is_specialization_of(type, template_name):
|
||||
|
|
|
@ -29,7 +29,7 @@ main()
|
|||
// { dg-final { note-test t1 {empty std::tuple} } }
|
||||
|
||||
std::tuple<std::string, int, std::tuple<>> t2{ "Johnny", 5, {} };
|
||||
// { dg-final { regexp-test t2 {std::tuple containing = {\[1\] = "Johnny", \[2\] = 5, \[3\] = {<std::(__7::)?tuple<>> = empty std::tuple, <No data fields>}}} } }
|
||||
// { dg-final { regexp-test t2 {std::tuple containing = {\[1\] = "Johnny", \[2\] = 5, \[3\] = {<std::(__8::)?tuple<>> = empty std::tuple, <No data fields>}}} } }
|
||||
|
||||
std::cout << "\n";
|
||||
return 0; // Mark SPOT
|
||||
|
|
Loading…
Reference in New Issue