diff options
author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-03-06 13:34:35 +0000 |
---|---|---|
committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-03-06 13:34:35 +0000 |
commit | 59fd55c6a94bc9206f412fe2fcaf31143d1510bf (patch) | |
tree | 9cd8c5cc8e99593fa7a95b30995dfc6a838300c9 /libstdc++-v3/scripts | |
parent | 487c79c3bd4f5e23e737763761ce044b015995b2 (diff) | |
download | gcc-59fd55c6a94bc9206f412fe2fcaf31143d1510bf.tar.gz |
Filter out basever symbols on Solaris
* scripts/extract_symvers.pl: Omit symbols bound to base
versions.
* scripts/extract_symvers.in: Likewise.
* config/abi/post/solaris2.9/baseline_symbols.txt: Regenerate.
* config/abi/post/solaris2.9/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@196489 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/scripts')
-rwxr-xr-x | libstdc++-v3/scripts/extract_symvers.in | 3 | ||||
-rw-r--r-- | libstdc++-v3/scripts/extract_symvers.pl | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libstdc++-v3/scripts/extract_symvers.in b/libstdc++-v3/scripts/extract_symvers.in index eac24979867..a262435de7a 100755 --- a/libstdc++-v3/scripts/extract_symvers.in +++ b/libstdc++-v3/scripts/extract_symvers.in @@ -49,9 +49,12 @@ SunOS) if readelf --help | grep -- --wide > /dev/null; then readelf="$readelf --wide" fi + # Omit _DYNAMIC etc. for consistency with extract_symvers.pl, only + # present on Solaris. ${readelf} ${lib} |\ sed -e 's/ \[<other>: [A-Fa-f0-9]*\] //' -e '/\.dynsym/,/^$/p;d' |\ egrep -v ' (LOCAL|UND) ' |\ + egrep -v ' (_DYNAMIC|_GLOBAL_OFFSET_TABLE_|_PROCEDURE_LINKAGE_TABLE_|_edata|_end|_etext)$' |\ sed -e 's/ <processor specific>: / <processor_specific>:_/g' |\ sed -e 's/ <OS specific>: / <OS_specific>:_/g' |\ sed -e 's/ <unknown>: / <unknown>:_/g' |\ diff --git a/libstdc++-v3/scripts/extract_symvers.pl b/libstdc++-v3/scripts/extract_symvers.pl index 31723fbccc1..d43c53e231f 100644 --- a/libstdc++-v3/scripts/extract_symvers.pl +++ b/libstdc++-v3/scripts/extract_symvers.pl @@ -67,7 +67,11 @@ while (<PVS>) { if ($version eq $symbol or $version eq $basever) { # Emit versions or symbols bound to base versions as objects. $type{$symbol} = "OBJECT"; - $version{$symbol} = $symbol; + if ($version eq $basever) { + $version{$symbol} = $version; + } else { + $version{$symbol} = $symbol; + } $size{$symbol} = 0; } else { # Everything else without a size field is a function. @@ -120,6 +124,10 @@ foreach $symbol (keys %type) { if ($type{$symbol} eq "FUNC" || $type{$symbol} eq "NOTYPE") { push @lines, "$type{$symbol}:$symbol\@\@$version{$symbol}\n"; } elsif ($type{$symbol} eq "OBJECT" and $size{$symbol} == 0) { + # Omit symbols bound to base version; details can differ depending + # on the toolchain used. + next if $version{$symbol} eq $basever; + push @lines, "$type{$symbol}:$size{$symbol}:$version{$symbol}\n"; } else { push @lines, "$type{$symbol}:$size{$symbol}:$symbol\@\@$version{$symbol}\n"; |