From 04f8b8f313f3e09a7a9b9cd5905b9968eb132a60 Mon Sep 17 00:00:00 2001 From: ro Date: Wed, 1 Dec 2010 13:55:16 +0000 Subject: [PATCH] * scripts/extract_symvers.pl: New file. * scripts/extract_symvers: Rename to ... * scripts/extract_symvers.in: ... this. Use extract_symvers.pl on SunOS. * configure.ac: Add scripts/extract_symvers to AC_CONFIG_FILES. * configure: Regenerate. * Makefile.in: Regenerate. * testsuite/Makefile.am (extract_symvers): Call extract_symvers from $(glibcxx_builddir). * testsuite/Makefile.in: Regenerate. * testsuite/libstdc++-abi/abi.exp: Call extract_symvers from $objdir. * config/abi/post/solaris2.8/baseline_symbols.txt: Regenerate. * config/abi/post/solaris2.8/sparcv9/baseline_symbols.txt: Likewise. * config/abi/post/solaris2.10/baseline_symbols.txt: Likewise. * config/abi/post/solaris2.10/amd64/baseline_symbols.txt: Likewise. * config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167330 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 21 ++++ libstdc++-v3/Makefile.in | 7 +- .../post/solaris2.10/amd64/baseline_symbols.txt | 11 +- .../abi/post/solaris2.10/baseline_symbols.txt | 11 +- .../post/solaris2.10/sparcv9/baseline_symbols.txt | 11 +- .../abi/post/solaris2.8/baseline_symbols.txt | 4 +- .../post/solaris2.8/sparcv9/baseline_symbols.txt | 4 +- libstdc++-v3/configure | 4 + libstdc++-v3/configure.ac | 1 + .../{extract_symvers => extract_symvers.in} | 43 +------ libstdc++-v3/scripts/extract_symvers.pl | 127 +++++++++++++++++++++ libstdc++-v3/testsuite/Makefile.am | 2 +- libstdc++-v3/testsuite/Makefile.in | 2 +- libstdc++-v3/testsuite/libstdc++-abi/abi.exp | 4 +- 14 files changed, 182 insertions(+), 70 deletions(-) rename libstdc++-v3/scripts/{extract_symvers => extract_symvers.in} (61%) create mode 100644 libstdc++-v3/scripts/extract_symvers.pl diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f72cb37..6e7b525 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,24 @@ +2010-12-01 Rainer Orth + + * scripts/extract_symvers.pl: New file. + * scripts/extract_symvers: Rename to ... + * scripts/extract_symvers.in: ... this. + Use extract_symvers.pl on SunOS. + * configure.ac: Add scripts/extract_symvers to AC_CONFIG_FILES. + * configure: Regenerate. + * Makefile.in: Regenerate. + * testsuite/Makefile.am (extract_symvers): Call extract_symvers + from $(glibcxx_builddir). + * testsuite/Makefile.in: Regenerate. + * testsuite/libstdc++-abi/abi.exp: Call extract_symvers from + $objdir. + + * config/abi/post/solaris2.8/baseline_symbols.txt: Regenerate. + * config/abi/post/solaris2.8/sparcv9/baseline_symbols.txt: Likewise. + * config/abi/post/solaris2.10/baseline_symbols.txt: Likewise. + * config/abi/post/solaris2.10/amd64/baseline_symbols.txt: Likewise. + * config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt: Likewise. + 2010-11-30 Paolo Carlini PR libstdc++/46718 diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index f62595f..7c1f356 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am README ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ - $(top_srcdir)/scripts/testsuite_flags.in + $(top_srcdir)/scripts/testsuite_flags.in \ + $(top_srcdir)/scripts/extract_symvers.in subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ @@ -64,7 +65,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = scripts/testsuite_flags +CONFIG_CLEAN_FILES = scripts/testsuite_flags scripts/extract_symvers CONFIG_CLEAN_VPATH_FILES = depcomp = am__depfiles_maybe = @@ -395,6 +396,8 @@ distclean-hdr: -rm -f config.h stamp-h1 scripts/testsuite_flags: $(top_builddir)/config.status $(top_srcdir)/scripts/testsuite_flags.in cd $(top_builddir) && $(SHELL) ./config.status $@ +scripts/extract_symvers: $(top_builddir)/config.status $(top_srcdir)/scripts/extract_symvers.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo diff --git a/libstdc++-v3/config/abi/post/solaris2.10/amd64/baseline_symbols.txt b/libstdc++-v3/config/abi/post/solaris2.10/amd64/baseline_symbols.txt index a7cc8e8..02c46f0 100644 --- a/libstdc++-v3/config/abi/post/solaris2.10/amd64/baseline_symbols.txt +++ b/libstdc++-v3/config/abi/post/solaris2.10/amd64/baseline_symbols.txt @@ -1234,7 +1234,6 @@ FUNC:_ZNSt12strstreambufC2El@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD0Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD2Ev@@GLIBCXX_3.4 -FUNC:_ZNSt12system_errorC1ESt10error_code@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD0Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD1Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD2Ev@@GLIBCXX_3.4.11 @@ -2115,6 +2114,7 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15_Fnv_hash_bytesPKvmm@@CXXABI_1.3.5 +FUNC:_ZSt15future_categoryv@@GLIBCXX_3.4.16 FUNC:_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15system_categoryv@@GLIBCXX_3.4.11 FUNC:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l@@GLIBCXX_3.4.9 @@ -2398,6 +2398,7 @@ OBJECT:0:GLIBCXX_3.4.12 OBJECT:0:GLIBCXX_3.4.13 OBJECT:0:GLIBCXX_3.4.14 OBJECT:0:GLIBCXX_3.4.15 +OBJECT:0:GLIBCXX_3.4.16 OBJECT:0:GLIBCXX_3.4.2 OBJECT:0:GLIBCXX_3.4.3 OBJECT:0:GLIBCXX_3.4.4 @@ -2782,9 +2783,6 @@ OBJECT:1:_ZNSt21__numeric_limits_base9is_iec559E@@GLIBCXX_3.4 OBJECT:1:_ZNSt21__numeric_limits_base9is_moduloE@@GLIBCXX_3.4 OBJECT:1:_ZNSt21__numeric_limits_base9is_signedE@@GLIBCXX_3.4 OBJECT:1:_ZNSt6chrono12system_clock12is_monotonicE@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt10adopt_lock@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt10defer_lock@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt11try_to_lock@@GLIBCXX_3.4.11 OBJECT:1:_ZSt7nothrow@@GLIBCXX_3.4 OBJECT:20:_ZTSSt12ctype_bynameIcE@@GLIBCXX_3.4 OBJECT:20:_ZTSSt12ctype_bynameIwE@@GLIBCXX_3.4 @@ -3496,10 +3494,9 @@ OBJECT:8:_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLI OBJECT:8:_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 OBJECT:8:_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4 OBJECT:8:_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 -OBJECT:8:_ZSt11__once_call@@GLIBCXX_3.4.11 -OBJECT:8:_ZSt15__once_callable@@GLIBCXX_3.4.11 -OBJECT:8:_ZSt15future_category@@GLIBCXX_3.4.14 OBJECT:96:_ZTVSt12ctype_bynameIcE@@GLIBCXX_3.4 OBJECT:96:_ZTVSt5ctypeIcE@@GLIBCXX_3.4 OBJECT:96:_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE@@GLIBCXX_3.4 OBJECT:96:_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE@@GLIBCXX_3.4 +TLS:8:_ZSt11__once_call@@GLIBCXX_3.4.11 +TLS:8:_ZSt15__once_callable@@GLIBCXX_3.4.11 diff --git a/libstdc++-v3/config/abi/post/solaris2.10/baseline_symbols.txt b/libstdc++-v3/config/abi/post/solaris2.10/baseline_symbols.txt index 032a3d0..473f39e 100644 --- a/libstdc++-v3/config/abi/post/solaris2.10/baseline_symbols.txt +++ b/libstdc++-v3/config/abi/post/solaris2.10/baseline_symbols.txt @@ -1234,7 +1234,6 @@ FUNC:_ZNSt12strstreambufC2Ei@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD0Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD2Ev@@GLIBCXX_3.4 -FUNC:_ZNSt12system_errorC1ESt10error_code@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD0Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD1Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD2Ev@@GLIBCXX_3.4.11 @@ -2115,6 +2114,7 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15_Fnv_hash_bytesPKvjj@@CXXABI_1.3.5 +FUNC:_ZSt15future_categoryv@@GLIBCXX_3.4.16 FUNC:_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15system_categoryv@@GLIBCXX_3.4.11 FUNC:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_i@@GLIBCXX_3.4.9 @@ -2398,6 +2398,7 @@ OBJECT:0:GLIBCXX_3.4.12 OBJECT:0:GLIBCXX_3.4.13 OBJECT:0:GLIBCXX_3.4.14 OBJECT:0:GLIBCXX_3.4.15 +OBJECT:0:GLIBCXX_3.4.16 OBJECT:0:GLIBCXX_3.4.2 OBJECT:0:GLIBCXX_3.4.3 OBJECT:0:GLIBCXX_3.4.4 @@ -2871,9 +2872,6 @@ OBJECT:1:_ZNSt21__numeric_limits_base9is_iec559E@@GLIBCXX_3.4 OBJECT:1:_ZNSt21__numeric_limits_base9is_moduloE@@GLIBCXX_3.4 OBJECT:1:_ZNSt21__numeric_limits_base9is_signedE@@GLIBCXX_3.4 OBJECT:1:_ZNSt6chrono12system_clock12is_monotonicE@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt10adopt_lock@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt10defer_lock@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt11try_to_lock@@GLIBCXX_3.4.11 OBJECT:1:_ZSt7nothrow@@GLIBCXX_3.4 OBJECT:20:_ZTSSt12ctype_bynameIcE@@GLIBCXX_3.4 OBJECT:20:_ZTSSt12ctype_bynameIwE@@GLIBCXX_3.4 @@ -3352,9 +3350,6 @@ OBJECT:4:_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLI OBJECT:4:_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 OBJECT:4:_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4 OBJECT:4:_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 -OBJECT:4:_ZSt11__once_call@@GLIBCXX_3.4.11 -OBJECT:4:_ZSt15__once_callable@@GLIBCXX_3.4.11 -OBJECT:4:_ZSt15future_category@@GLIBCXX_3.4.14 OBJECT:4:_ZTSPKa@@CXXABI_1.3 OBJECT:4:_ZTSPKb@@CXXABI_1.3 OBJECT:4:_ZTSPKc@@CXXABI_1.3 @@ -3491,3 +3486,5 @@ OBJECT:8:_ZTTSi@@GLIBCXX_3.4 OBJECT:8:_ZTTSo@@GLIBCXX_3.4 OBJECT:8:_ZTTSt13basic_istreamIwSt11char_traitsIwEE@@GLIBCXX_3.4 OBJECT:8:_ZTTSt13basic_ostreamIwSt11char_traitsIwEE@@GLIBCXX_3.4 +TLS:4:_ZSt11__once_call@@GLIBCXX_3.4.11 +TLS:4:_ZSt15__once_callable@@GLIBCXX_3.4.11 diff --git a/libstdc++-v3/config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt b/libstdc++-v3/config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt index 77f1e18..1c7c031 100644 --- a/libstdc++-v3/config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt +++ b/libstdc++-v3/config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt @@ -1234,7 +1234,6 @@ FUNC:_ZNSt12strstreambufC2El@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD0Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD2Ev@@GLIBCXX_3.4 -FUNC:_ZNSt12system_errorC1ESt10error_code@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD0Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD1Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD2Ev@@GLIBCXX_3.4.11 @@ -2115,6 +2114,7 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15_Fnv_hash_bytesPKvmm@@CXXABI_1.3.5 +FUNC:_ZSt15future_categoryv@@GLIBCXX_3.4.16 FUNC:_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15system_categoryv@@GLIBCXX_3.4.11 FUNC:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l@@GLIBCXX_3.4.9 @@ -2398,6 +2398,7 @@ OBJECT:0:GLIBCXX_3.4.12 OBJECT:0:GLIBCXX_3.4.13 OBJECT:0:GLIBCXX_3.4.14 OBJECT:0:GLIBCXX_3.4.15 +OBJECT:0:GLIBCXX_3.4.16 OBJECT:0:GLIBCXX_3.4.2 OBJECT:0:GLIBCXX_3.4.3 OBJECT:0:GLIBCXX_3.4.4 @@ -2782,9 +2783,6 @@ OBJECT:1:_ZNSt21__numeric_limits_base9is_iec559E@@GLIBCXX_3.4 OBJECT:1:_ZNSt21__numeric_limits_base9is_moduloE@@GLIBCXX_3.4 OBJECT:1:_ZNSt21__numeric_limits_base9is_signedE@@GLIBCXX_3.4 OBJECT:1:_ZNSt6chrono12system_clock12is_monotonicE@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt10adopt_lock@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt10defer_lock@@GLIBCXX_3.4.11 -OBJECT:1:_ZSt11try_to_lock@@GLIBCXX_3.4.11 OBJECT:1:_ZSt7nothrow@@GLIBCXX_3.4 OBJECT:20:_ZTSSt12ctype_bynameIcE@@GLIBCXX_3.4 OBJECT:20:_ZTSSt12ctype_bynameIwE@@GLIBCXX_3.4 @@ -3496,10 +3494,9 @@ OBJECT:8:_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLI OBJECT:8:_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 OBJECT:8:_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4 OBJECT:8:_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 -OBJECT:8:_ZSt11__once_call@@GLIBCXX_3.4.11 -OBJECT:8:_ZSt15__once_callable@@GLIBCXX_3.4.11 -OBJECT:8:_ZSt15future_category@@GLIBCXX_3.4.14 OBJECT:96:_ZTVSt12ctype_bynameIcE@@GLIBCXX_3.4 OBJECT:96:_ZTVSt5ctypeIcE@@GLIBCXX_3.4 OBJECT:96:_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE@@GLIBCXX_3.4 OBJECT:96:_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE@@GLIBCXX_3.4 +TLS:8:_ZSt11__once_call@@GLIBCXX_3.4.11 +TLS:8:_ZSt15__once_callable@@GLIBCXX_3.4.11 diff --git a/libstdc++-v3/config/abi/post/solaris2.8/baseline_symbols.txt b/libstdc++-v3/config/abi/post/solaris2.8/baseline_symbols.txt index 767aeaf..5e3601d 100644 --- a/libstdc++-v3/config/abi/post/solaris2.8/baseline_symbols.txt +++ b/libstdc++-v3/config/abi/post/solaris2.8/baseline_symbols.txt @@ -1233,7 +1233,6 @@ FUNC:_ZNSt12strstreambufC2Ei@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD0Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD2Ev@@GLIBCXX_3.4 -FUNC:_ZNSt12system_errorC1ESt10error_code@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD0Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD1Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD2Ev@@GLIBCXX_3.4.11 @@ -2100,6 +2099,7 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15_Fnv_hash_bytesPKvjj@@CXXABI_1.3.5 +FUNC:_ZSt15future_categoryv@@GLIBCXX_3.4.16 FUNC:_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15system_categoryv@@GLIBCXX_3.4.11 FUNC:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_i@@GLIBCXX_3.4.9 @@ -2425,6 +2425,7 @@ OBJECT:0:GLIBCXX_3.4.12 OBJECT:0:GLIBCXX_3.4.13 OBJECT:0:GLIBCXX_3.4.14 OBJECT:0:GLIBCXX_3.4.15 +OBJECT:0:GLIBCXX_3.4.16 OBJECT:0:GLIBCXX_3.4.2 OBJECT:0:GLIBCXX_3.4.3 OBJECT:0:GLIBCXX_3.4.4 @@ -3373,7 +3374,6 @@ OBJECT:4:_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLI OBJECT:4:_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 OBJECT:4:_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4 OBJECT:4:_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 -OBJECT:4:_ZSt15future_category@@GLIBCXX_3.4.14 OBJECT:4:_ZTSPKa@@CXXABI_1.3 OBJECT:4:_ZTSPKb@@CXXABI_1.3 OBJECT:4:_ZTSPKc@@CXXABI_1.3 diff --git a/libstdc++-v3/config/abi/post/solaris2.8/sparcv9/baseline_symbols.txt b/libstdc++-v3/config/abi/post/solaris2.8/sparcv9/baseline_symbols.txt index a31c7cb..f4bb491 100644 --- a/libstdc++-v3/config/abi/post/solaris2.8/sparcv9/baseline_symbols.txt +++ b/libstdc++-v3/config/abi/post/solaris2.8/sparcv9/baseline_symbols.txt @@ -1233,7 +1233,6 @@ FUNC:_ZNSt12strstreambufC2El@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD0Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt12strstreambufD2Ev@@GLIBCXX_3.4 -FUNC:_ZNSt12system_errorC1ESt10error_code@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD0Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD1Ev@@GLIBCXX_3.4.11 FUNC:_ZNSt12system_errorD2Ev@@GLIBCXX_3.4.11 @@ -2100,6 +2099,7 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKPi@@GLIBCXX_3.4 FUNC:_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15_Fnv_hash_bytesPKvmm@@CXXABI_1.3.5 +FUNC:_ZSt15future_categoryv@@GLIBCXX_3.4.16 FUNC:_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15system_categoryv@@GLIBCXX_3.4.11 FUNC:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l@@GLIBCXX_3.4.9 @@ -2425,6 +2425,7 @@ OBJECT:0:GLIBCXX_3.4.12 OBJECT:0:GLIBCXX_3.4.13 OBJECT:0:GLIBCXX_3.4.14 OBJECT:0:GLIBCXX_3.4.15 +OBJECT:0:GLIBCXX_3.4.16 OBJECT:0:GLIBCXX_3.4.2 OBJECT:0:GLIBCXX_3.4.3 OBJECT:0:GLIBCXX_3.4.4 @@ -3517,7 +3518,6 @@ OBJECT:8:_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLI OBJECT:8:_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 OBJECT:8:_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4 OBJECT:8:_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 -OBJECT:8:_ZSt15future_category@@GLIBCXX_3.4.14 OBJECT:96:_ZTVSt12ctype_bynameIcE@@GLIBCXX_3.4 OBJECT:96:_ZTVSt5ctypeIcE@@GLIBCXX_3.4 OBJECT:96:_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE@@GLIBCXX_3.4 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 0778745..3cdb123 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -59292,6 +59292,8 @@ ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files scripts/testsuite_flags" +ac_config_files="$ac_config_files scripts/extract_symvers" + # Multilibs need MULTISUBDIR defined correctly in certain makefiles so # that multilib installs will end up installed in the correct place. @@ -60470,6 +60472,7 @@ do "include/gstdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/gstdint.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "scripts/testsuite_flags") CONFIG_FILES="$CONFIG_FILES scripts/testsuite_flags" ;; + "scripts/extract_symvers") CONFIG_FILES="$CONFIG_FILES scripts/extract_symvers" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "libsupc++/Makefile") CONFIG_FILES="$CONFIG_FILES libsupc++/Makefile" ;; "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; @@ -62253,6 +62256,7 @@ fi ;; "scripts/testsuite_flags":F) chmod +x scripts/testsuite_flags ;; + "scripts/extract_symvers":F) chmod +x scripts/extract_symvers ;; "include/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index f3dfe01..04d0f3b 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -375,6 +375,7 @@ dnl which can all be called multiple times as needed, plus one (different) dnl AC_OUTPUT macro. This one lists the files to be created: AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES([scripts/testsuite_flags],[chmod +x scripts/testsuite_flags]) +AC_CONFIG_FILES([scripts/extract_symvers],[chmod +x scripts/extract_symvers]) # Multilibs need MULTISUBDIR defined correctly in certain makefiles so # that multilib installs will end up installed in the correct place. diff --git a/libstdc++-v3/scripts/extract_symvers b/libstdc++-v3/scripts/extract_symvers.in similarity index 61% rename from libstdc++-v3/scripts/extract_symvers rename to libstdc++-v3/scripts/extract_symvers.in index 7510233..a2ff3c4 100755 --- a/libstdc++-v3/scripts/extract_symvers +++ b/libstdc++-v3/scripts/extract_symvers.in @@ -36,45 +36,10 @@ tmp=extract.$$ case `uname -s` in SunOS) - # Sun ld doesn't record symbol versions in .dynsym entries and they - # cannot easily be extracted from readelf --versions output, so use pvs - # instead. Linux may have a completely different pvs from LVM2, so only - # do this on SunOS. - # Need to use nawk on Solaris 2 since Solaris 8/9 awk (oawk) cannot handle - # sub. - pvs -dsvo ${lib} | \ - nawk '# Remove colon separator from version field, trailing semicolon. - { - sub (/:$/, "", $3); - sub (/;$/, ""); - } - # Record base version. The [BASE] field was only added in Solaris 11, - # so simply use the first record instead. - NR == 1 { - basever = $3; - next; - } - # Ignore version dependencies. - $4 ~ /\{.*\}/ { - next; - } - NF == 4 { - if ($3 == $4 || $3 == basever) - # Emit versions or symbols bound to base versions as objects. - printf "OBJECT:0:%s\n", $4; - else - # Everything else without a size field is a function. - printf "FUNC:%s@@%s\n", $4, $3; - next; - } - # Emit objects. - NF == 5 { - # Strip parens from object size. - sub (/^\(/, "", $5); - sub (/\)$/, "", $5); - printf "OBJECT:%s:%s@@%s\n", $5, $4, $3; - next; - }' | sort | uniq > $tmp 2>&1 + # Ensure that output on Solaris 2 matches readelf below without requiring + # GNU binutils to be installed. This requires a combination of pvs and + # elfdump, which is easier handled in a perl script. + perl @glibcxx_srcdir@/scripts/extract_symvers.pl ${lib} > $tmp 2>&1 ;; *) # GNU binutils, somewhere after version 2.11.2, requires -W/--wide to diff --git a/libstdc++-v3/scripts/extract_symvers.pl b/libstdc++-v3/scripts/extract_symvers.pl new file mode 100644 index 0000000..2bac1cd --- /dev/null +++ b/libstdc++-v3/scripts/extract_symvers.pl @@ -0,0 +1,127 @@ +#!/usr/bin/perl -w + +# Copyright (C) 2010 Free Software Foundation, Inc. +# +# This file is part of the GNU ISO C++ Library. This library is free +# software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this library; see the file COPYING3. If not see +# . + +# Extract symbol version information on Solaris 2. +# +# Sun ld doesn't record symbol versions in .dynsym entries and they cannot +# easily be extracted from readelf --versions output, so use pvs instead. +# This way, we don't require GNU binutils in the native case. Also ensures +# that baseline_symbols.txt is identical between native (pvs, elfdump) and +# cross (readelf) cases. + +my $lib = shift; + +open PVS, "pvs -dsvo $lib |" or die $!; +while () { + chomp; + + # Remove trailing semicolon. + s/;$//; + + # shared object, dash, version, symbol, [size] + (undef, undef, $version, $symbol, $size) = split; + + # Remove colon separator from version field. + $version =~ s/:$//; + + # Record base version. The [BASE] field was only added in Solaris 11, + # so simply use the first record instead. + if ($. == 1) { + $basever = $version; + next; + } + + # Skip version declarations. + next unless defined ($symbol); + + # Ignore version dependencies. + next if ($symbol =~ /\{.*\}/); + + # Emit objects. + if (defined ($size)) { + # Strip parens from object size. + $size =~ s/\((\d+)\)/$1/; + + $type{$symbol} = "OBJECT"; + $version{$symbol} = $version; + $size{$symbol} = $size; + next; + } + + if ($version eq $symbol or $version eq $basever) { + # Emit versions or symbols bound to base versions as objects. + $type{$symbol} = "OBJECT"; + $version{$symbol} = $symbol; + $size{$symbol} = 0; + } else { + # Everything else without a size field is a function. + $type{$symbol} = "FUNC"; + $version{$symbol} = $version; + } +} +close PVS or die "pvs error"; + +# Only look at .dynsym table, like readelf in extract_symvers. +open ELFDUMP, "/usr/ccs/bin/elfdump -s -N .dynsym $lib |" or die $!; +while () { + chomp; + + # Ignore empty lines. + next if (/^$/); + + # Ignore object name header. + next if (/:$/); + + # Ignore table header lines. + next if (/^Symbol Table Section:/); + next if (/index.*value.*size/); + + # Split table. + (undef, undef, undef, $type, $bind, $oth, undef, $shndx, $name) = split; + + # Error out for unknown input. + die "unknown input line:\n$_" unless defined($bind); + + # Ignore local symbols. + next if ($bind eq "LOCL"); + # Ignore hidden symbols. + next if ($oth eq "H"); + # Ignore undefined symbols. + next if ($shndx eq "UNDEF"); + # Error out for unhandled cases. _GLOBAL_OFFSET_TABLE_ is P (protected). + die "unhandled symbol:\n$_" if ($bind !~ /^(GLOB|WEAK)/ or $oth !~ /[DP]/); + + # Adapt to readelf type naming convention. + $type = "OBJECT" if ($type eq "OBJT"); + + # Use correct symbol type. + $type{$name} = $type if ($type{$name} ne $type); +} +close ELFDUMP or die "elfdump error"; + +foreach $symbol (keys %type) { + if ($type{$symbol} eq "FUNC") { + push @lines, "$type{$symbol}:$symbol\@\@$version{$symbol}\n"; + } elsif ($type{$symbol} eq "OBJECT" and $size{$symbol} == 0) { + push @lines, "$type{$symbol}:$size{$symbol}:$version{$symbol}\n"; + } else { + push @lines, "$type{$symbol}:$size{$symbol}:$symbol\@\@$version{$symbol}\n"; + } +} +print sort @lines; diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index 1f2d34d..c2b8166 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -67,7 +67,7 @@ site.exp: Makefile @mv site.tmp site.exp -extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers +extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers baseline_subdir := $(shell $(CXX) --print-multi-dir) diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 1a6546e..d159355 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -273,7 +273,7 @@ lists_of_files = \ testsuite_files_interactive \ testsuite_files_performance -extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers +extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers baseline_subdir := $(shell $(CXX) --print-multi-dir) check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3) diff --git a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp index a0e8f28..d05851f 100644 --- a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp +++ b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ if ![file exists $baseline_file] { send_log "Checking $lib against $baseline_file\n" # Figure out what symbols are defined by the active build of the library. -remote_exec "build" "$srcdir/../scripts/extract_symvers" \ +remote_exec "build" "$objdir/../scripts/extract_symvers" \ [list $lib "current_symbols.txt"] # Build the abi_check program. -- 2.7.4