From e1208a579981b33f86535e7d1fb42ea843d04737 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 1 Dec 2010 13:55:16 +0000 Subject: extract_symvers.pl: New file. * 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 --- libstdc++-v3/scripts/extract_symvers | 102 ------------------------- libstdc++-v3/scripts/extract_symvers.in | 67 +++++++++++++++++ libstdc++-v3/scripts/extract_symvers.pl | 127 ++++++++++++++++++++++++++++++++ 3 files changed, 194 insertions(+), 102 deletions(-) delete mode 100755 libstdc++-v3/scripts/extract_symvers create mode 100755 libstdc++-v3/scripts/extract_symvers.in create mode 100644 libstdc++-v3/scripts/extract_symvers.pl (limited to 'libstdc++-v3/scripts') diff --git a/libstdc++-v3/scripts/extract_symvers b/libstdc++-v3/scripts/extract_symvers deleted file mode 100755 index 7510233..0000000 --- a/libstdc++-v3/scripts/extract_symvers +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2002, 2003, 2009, 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 -# . - - -if test ${#} -lt 2 || test $1 = '--help'; then - echo "Usage: extract_symvers shared_lib output_file" 1>&2 - exit 1 -fi - -lib=$1 -output=$2 - -# This avoids weird sorting problems later. -LC_ALL=C -export LC_ALL -LANG=C -export LANG - -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 - ;; -*) - # GNU binutils, somewhere after version 2.11.2, requires -W/--wide to - # avoid default line truncation. -W is not supported and truncation did - # not occur by default before that point. - readelf="readelf --symbols" - if readelf --help | grep -- --wide > /dev/null; then - readelf="$readelf --wide" - fi - ${readelf} ${lib} |\ - sed -e 's/ \[: [A-Fa-f0-9]*\] //' -e '/\.dynsym/,/^$/p;d' |\ - egrep -v ' (LOCAL|UND) ' |\ - awk '{ if ($4 == "FUNC" || $4 == "NOTYPE") - printf "%s:%s\n", $4, $8; - else if ($4 == "OBJECT" || $4 == "TLS") - printf "%s:%s:%s\n", $4, $3, $8; - }' | sort | uniq > $tmp 2>&1 -# else printf "Huh? What is %s?\n", $8; - ;; -esac - -# I think we'll be doing some more with this file, but for now, dump. -mv $tmp $output - -exit 0 diff --git a/libstdc++-v3/scripts/extract_symvers.in b/libstdc++-v3/scripts/extract_symvers.in new file mode 100755 index 0000000..a2ff3c4 --- /dev/null +++ b/libstdc++-v3/scripts/extract_symvers.in @@ -0,0 +1,67 @@ +#!/bin/sh + +# Copyright (C) 2002, 2003, 2009, 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 +# . + + +if test ${#} -lt 2 || test $1 = '--help'; then + echo "Usage: extract_symvers shared_lib output_file" 1>&2 + exit 1 +fi + +lib=$1 +output=$2 + +# This avoids weird sorting problems later. +LC_ALL=C +export LC_ALL +LANG=C +export LANG + +tmp=extract.$$ + +case `uname -s` in +SunOS) + # 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 + # avoid default line truncation. -W is not supported and truncation did + # not occur by default before that point. + readelf="readelf --symbols" + if readelf --help | grep -- --wide > /dev/null; then + readelf="$readelf --wide" + fi + ${readelf} ${lib} |\ + sed -e 's/ \[: [A-Fa-f0-9]*\] //' -e '/\.dynsym/,/^$/p;d' |\ + egrep -v ' (LOCAL|UND) ' |\ + awk '{ if ($4 == "FUNC" || $4 == "NOTYPE") + printf "%s:%s\n", $4, $8; + else if ($4 == "OBJECT" || $4 == "TLS") + printf "%s:%s:%s\n", $4, $3, $8; + }' | sort | uniq > $tmp 2>&1 +# else printf "Huh? What is %s?\n", $8; + ;; +esac + +# I think we'll be doing some more with this file, but for now, dump. +mv $tmp $output + +exit 0 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; -- cgit v1.1