aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-04-02 04:00:03 +0000
committerRoland McGrath <roland@gnu.org>2003-04-02 04:00:03 +0000
commita9448c548d457ab82445571344475f815f9f0aec (patch)
tree571ee095b21acdacfe37e3f58650470f57439967
parent6b4686a534c10cc9011c9d352d1b57d5a76d5579 (diff)
downloadglibc-a9448c548d457ab82445571344475f815f9f0aec.tar
glibc-a9448c548d457ab82445571344475f815f9f0aec.tar.gz
glibc-a9448c548d457ab82445571344475f815f9f0aec.tar.bz2
glibc-a9448c548d457ab82445571344475f815f9f0aec.zip
2003-04-01 Roland McGrath <roland@redhat.com>
* scripts/abilist.awk: Allow dots in soname suffix. * scripts/abilist.awk (emit): Fix bailout condition.
-rw-r--r--scripts/abilist.awk10
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/abilist.awk b/scripts/abilist.awk
index efadc1cbf8..a042ce7113 100644
--- a/scripts/abilist.awk
+++ b/scripts/abilist.awk
@@ -9,7 +9,7 @@ BEGIN {
}
# Per-file header.
-/[^ :]+\.so\.[0-9]+:[ ]+.file format .*$/ {
+/[^ :]+\.so\.[0-9.]+:[ ]+.file format .*$/ {
emit(0);
seen_opd = 0;
@@ -18,7 +18,7 @@ BEGIN {
sub(/:$/, "", sofullname);
soname = sofullname;
sub(/^.*\//, "", soname);
- sub(/\.so\.[0-9]+$/, "", soname);
+ sub(/\.so\.[0-9.]+$/, "", soname);
suppress = ((filename_regexp != "" && sofullname !~ filename_regexp) \
|| (libname_regexp != "" && soname !~ libname_regexp));
@@ -106,11 +106,9 @@ NF == 0 || /DYNAMIC SYMBOL TABLE/ || /file format/ { next }
}
function emit(end) {
- if (! parse_names || soname == "")
+ if (!end && (combine || ! parse_names || soname == ""))
return;
- if (combine && !end)
- return;
- tofile = !combine;
+ tofile = parse_names && !combine;
nverslist = 0;
for (version in versions) {