* scripts/merge-abilist.awk: More checks for bogus input.

Uniquify duplicate config names.

	* scripts/abilist.awk: Don't distinguish weak symbols in normal output.
This commit is contained in:
Roland McGrath 2003-03-03 02:38:36 +00:00
parent 44aeb4868c
commit 8f3846a978
2 changed files with 24 additions and 6 deletions

View File

@ -1,5 +1,10 @@
2003-03-02 Roland McGrath <roland@redhat.com> 2003-03-02 Roland McGrath <roland@redhat.com>
* scripts/merge-abilist.awk: More checks for bogus input.
Uniquify duplicate config names.
* scripts/abilist.awk: Don't distinguish weak symbols in normal output.
* sysdeps/powerpc/powerpc32/dl-machine.c (_dl_reloc_overflow): Renamed * sysdeps/powerpc/powerpc32/dl-machine.c (_dl_reloc_overflow): Renamed
from dl_reloc_overflow, make global. from dl_reloc_overflow, make global.
(__process_machine_rela): Update callers. (__process_machine_rela): Update callers.

View File

@ -12,9 +12,11 @@
# function F # function F
# variable D 0x4 # variable D 0x4
BEGIN { current = "UNSET" }
/^[^| ]/ { /^[^| ]/ {
if (NF < 2 && config == "") { if (NF < 2 && config == "") {
print "BAD LINE:", $0 > "/dev/stderr"; print FILENAME ":" FNR ": BAD SET LINE:", $0 > "/dev/stderr";
exit 2; exit 2;
} }
@ -44,8 +46,8 @@
} }
/^\| / { /^\| / {
if (NF < 3) { if (NF < 3 || current == "UNSET") {
print "BAD LINE:", $0 > "/dev/stderr"; print FILENAME ":" FNR ": BAD | LINE:", $0 > "/dev/stderr";
exit 2; exit 2;
} }
@ -61,12 +63,20 @@
{ {
if (current == "") next; if (current == "") next;
if (current == "UNSET") {
print FILENAME ":" FNR ": IGNORED LINE:", $0 > "/dev/stderr";
next;
}
ns = split(seen[$0], s, ","); ns = split(seen[$0], s, ",");
nc = split(current, c, ","); nc = split(current, c, ",");
for (i = 1; i <= nc; ++i) { for (i = 1; i <= nc; ++i) {
if (c[i] == "")
continue;
# Sorted insert. # Sorted insert.
for (j = 1; j <= ns; ++j) { for (j = 1; j <= ns; ++j) {
if (c[i] == s[j])
break;
if (c[i] < s[j]) { if (c[i] < s[j]) {
for (k = ns; k >= j; --k) for (k = ns; k >= j; --k)
s[k + 1] = s[k]; s[k + 1] = s[k];
@ -75,7 +85,7 @@
break; break;
} }
} }
if (j >= ns) if (j > ns)
s[++ns] = c[i]; s[++ns] = c[i];
} }
@ -97,7 +107,9 @@ END {
ns = split("", s); ns = split("", s);
for (configs in stanzas) { for (configs in stanzas) {
# Sorted insert. # Sorted insert.
for (j = 1; j <= ns; ++j) for (j = 1; j <= ns; ++j) {
if (configs == s[j])
break;
if (configs < s[j]) { if (configs < s[j]) {
for (k = ns; k >= j; --k) for (k = ns; k >= j; --k)
s[k + 1] = s[k]; s[k + 1] = s[k];
@ -105,7 +117,8 @@ END {
++ns; ++ns;
break; break;
} }
if (j >= ns) }
if (j > ns)
s[++ns] = configs; s[++ns] = configs;
} }