* scripts/soversions.awk: Fix default version set handling.

This commit is contained in:
Roland McGrath 2005-02-11 09:54:46 +00:00
parent 561bcb8086
commit 9b382805e2
2 changed files with 19 additions and 9 deletions

View file

@ -1,3 +1,7 @@
2005-02-11 Roland McGrath <roland@redhat.com>
* scripts/soversions.awk: Fix default version set handling.
2005-02-10 Roland McGrath <roland@redhat.com>
[BZ #157]

View file

@ -20,11 +20,8 @@ $2 ~ /WORDSIZE[3264]/ {
# Obey the first matching DEFAULT line.
$2 == "DEFAULT" {
if (!matched_default[thiscf]) {
matched_default[thiscf] = 1;
$1 = $2 = "";
default_set[thiscf] = $0;
}
$1 = $2 = "";
default_set[++ndefault_set] = thiscf "\n" $0;
next
}
@ -48,12 +45,21 @@ END {
split(elt, x);
cf = x[1];
lib = x[2];
if (default_setname && !(cf in default_set) && config ~ cf)
default_set[cf] = default_setname;
set = (elt in versions) ? versions[elt] : default_set[cf];
line = set ? (lib FS numbers[elt] FS set) : (lib FS numbers[elt]);
for (c in configs)
if (c ~ cf) {
if (elt in versions)
set = versions[elt];
else {
set = (c == config) ? default_setname : "";
for (i = 1; i <= ndefault_set; ++i) {
split(default_set[i], x, "\n");
if (c ~ x[1]) {
set = x[2];
break;
}
}
}
line = set ? (lib FS numbers[elt] FS set) : (lib FS numbers[elt]);
if (!((c FS lib) in lineorder) || order[elt] < lineorder[c FS lib]) {
lineorder[c FS lib] = order[elt];
lines[c FS lib] = configs[c] FS line;