From 3b0f203438665e5032d6f4d56dd2c60a41a1061f Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 15 Mar 2011 18:58:12 +0000 Subject: [PATCH] gnu.ver: Make nested_exception exports super clear. 2011-03-15 Benjamin Kosnik * config/abi/pre/gnu.ver: Make nested_exception exports super clear. Move bad_function_call exports from CXXABI_1.3.5 to GLIBCXX_3.4.15. From-SVN: r171014 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/config/abi/pre/gnu.ver | 28 +++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f38927f..f5dd9b4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-03-15 Benjamin Kosnik + + * config/abi/pre/gnu.ver: Make nested_exception exports super clear. + Move bad_function_call exports from CXXABI_1.3.5 to GLIBCXX_3.4.15. + 2011-03-14 Benjamin Kosnik PR libstdc++/48130 diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index c85ba8e..d5952109 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -618,7 +618,10 @@ GLIBCXX_3.4 { _ZTVSt[0-9][0-9][g-k]*; _ZTVSt11logic_error; _ZTVSt12length_error; - _ZTVSt[0-9][0-9][m-q]*; +# _ZTVSt[0-9][0-9][m-q]*; + _ZTVSt[0-9][0-9][m]*; + _ZTVSt[0-9][0-9]n[^e]*; + _ZTVSt[0-9][0-9][o-q]*; _ZTVSt11range_error; _ZTVSt13runtime_error; _ZTVSt[0-9][0-9][t-z]*; @@ -648,7 +651,10 @@ GLIBCXX_3.4 { _ZTISt[0-9][0-9][g-k]*; _ZTISt11logic_error; _ZTISt12length_error; - _ZTISt[0-9][0-9][m-q]*; +# _ZTISt[0-9][0-9][m-q]*; + _ZTISt[0-9][0-9][m]*; + _ZTISt[0-9][0-9]n[^e]*; + _ZTISt[0-9][0-9][o-q]*; _ZTISt11range_error; _ZTISt13runtime_error; _ZTISt[0-9][0-9][t-z]*; @@ -682,7 +688,10 @@ GLIBCXX_3.4 { _ZTSSt[0-9][0-9][g-k]*; _ZTSSt11logic_error; _ZTSSt12length_error; - _ZTSSt[0-9][0-9][m-q]*; +# _ZTSSt[0-9][0-9][m-q]*; + _ZTSSt[0-9][0-9][m]*; + _ZTSSt[0-9][0-9]n[^e]*; + _ZTSSt[0-9][0-9][o-q]*; _ZTSSt11range_error; _ZTSSt13runtime_error; _ZTSSt[0-9][0-9][t-z]*; @@ -1219,12 +1228,19 @@ GLIBCXX_3.4.15 { _ZTISt11regex_error; _ZSt19__throw_regex_errorNSt15regex_constants10error_typeE; + # std::bad_weak_ptr _ZNSt12bad_weak_ptrD*; _ZNKSt12bad_weak_ptr4whatEv; _ZTSSt12bad_weak_ptr; _ZTVSt12bad_weak_ptr; _ZTISt12bad_weak_ptr; + # std::bad_function_call + _ZNSt17bad_function_callD*; + _ZTISt17bad_function_call; + _ZTSSt17bad_function_call; + _ZTVSt17bad_function_call; + _ZNSt14error_categoryC*; _ZNSt14error_categoryD*; @@ -1422,12 +1438,6 @@ CXXABI_1.3.5 { # FNV hash. _ZSt15_Fnv_hash_bytesPKv*; - # std::bad_function_call. - _ZNSt17bad_function_callD*; - _ZTISt17bad_function_call; - _ZTSSt17bad_function_call; - _ZTVSt17bad_function_call; - # std::nested_exception _ZNSt16nested_exceptionD*; _ZTISt16nested_exception; -- 2.7.4