* 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.
From-SVN: r167330
+2010-12-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * 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 <paolo.carlini@oracle.com>
PR libstdc++/46718
$(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 \
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 =
-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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
"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" ;;
;;
"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
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.
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
--- /dev/null
+#!/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
+# <http://www.gnu.org/licenses/>.
+
+# 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 (<PVS>) {
+ 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 (<ELFDUMP>) {
+ 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;
@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)
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)
-# 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
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.