diff options
| -rw-r--r-- | scripts/extract-abilist.awk | 87 | ||||
| -rw-r--r-- | scripts/merge-abilist.awk | 194 |
2 files changed, 153 insertions, 128 deletions
diff --git a/scripts/extract-abilist.awk b/scripts/extract-abilist.awk index c5b76e1309..e4f466e6a9 100644 --- a/scripts/extract-abilist.awk +++ b/scripts/extract-abilist.awk @@ -2,43 +2,94 @@ # This must be passed run with awk -v config=TUPLE to specify the configuration # tuple we will match. The merged file contains stanzas in the form: # GLIBC_x.y regexp... +# | GLIBC_x.y.z regexp... +# | GLIBC_m.n regexp... # function F # variable D 0x4 # Each regexp is matched against TUPLE, and only matching stanzas go -# into the output, with the regexp list removed. The result matches the -# original .symlist file from abilist.awk that was fed into merge-abilist.awk. +# into the output, with the regexp list removed. Multiple version lines +# can match with the same regexp, meaning the stanza is duplicated in +# multiple version sets. The result matches the original .symlist file +# from abilist.awk that was fed into merge-abilist.awk. BEGIN { - outpipe = ""; + inside = 0; } -/^ / { if (!ignore) print | outpipe; next; } +/^ / { + inside = 1; + if (!ignore) { + for (version in current) { + if (version in versions) + versions[version] = versions[version] "\n" $0; + else + versions[version] = $0; + } + } + next; +} { - for (i = 2; i <= NF; ++i) { + second = ($1 == "|"); + if (second && inside) { + printf "%s:%d: bad input line inside stanza: %s\n", FILENAME, FNR, $0; + exit 1; + } + inside = 0; + + for (i = second ? 3 : 2; i <= NF; ++i) { regex = "^" $i "$"; if (match(config, regex) != 0) { - if ($1 != version) { - if (outpipe != "") { - close(outpipe); - } - version = $1; - print version; - outpipe = "sort"; - } + if (!second || ignore) + # Clear old array. + split("", current); + current[second ? $2 : $1] = 1; ignore = 0; next; } } - ignore = 1; + + if (!second) + ignore = 1; next; } END { - if (outpipe == "") { - print "No stanza matched", config > "/dev/stderr"; - exit 2; + nverlist = 0; + for (version in versions) { + if (nverslist == 0) { + verslist = version; + nverslist = 1; + continue; + } + split(verslist, s, "\n"); + if (version < s[1]) { + verslist = version; + for (i = 1; i <= nverslist; ++i) { + verslist = verslist "\n" s[i]; + } + } + else { + verslist = s[1]; + for (i = 2; i <= nverslist; ++i) { + if (version < s[i]) break; + verslist = verslist "\n" s[i]; + } + verslist = verslist "\n" version; + for (; i <= nverslist; ++i) { + verslist = verslist "\n" s[i]; + } + } + ++nverslist; } - else + + split(verslist, order, "\n"); + for (i = 1; i <= nverslist; ++i) { + version = order[i]; + + print version; + outpipe = "sort"; + print versions[version] | outpipe; close(outpipe); + } } diff --git a/scripts/merge-abilist.awk b/scripts/merge-abilist.awk index f84a6b7839..03675f299f 100644 --- a/scripts/merge-abilist.awk +++ b/scripts/merge-abilist.awk @@ -1,11 +1,18 @@ # awk script to merge a config-specific .symlist file with others. -# The input files should be an existing .abilist file, and a .symlist file. -# This must be passed run with awk -v config=REGEXP to specify a regexp -# matching configuration tuples for which the .symlist input defines an ABI. -# The result merges all duplicate occurrences of any symbol in a version set -# into a stanza listing the regexps matching configurations that contain it. +# The input files should be existing .abilist files, and a .symlist +# file. This must be run with awk -v config=REGEXP to specify a +# regexp matching configuration tuples for which the .symlist input +# defines an ABI. The result merges all duplicate occurrences of any +# symbol into a stanza listing the regexps matching configurations +# that contain it and giving associated versions. +# The merged file contains stanzas in the form: +# GLIBC_x.y regexp... +# | GLIBC_x.y.z regexp... +# | GLIBC_m.n regexp... +# function F +# variable D 0x4 -/^[^ ]/ { +/^[^| ]/ { if (NF < 2 && config == "") { print "BAD LINE:", $0 > "/dev/stderr"; exit 2; @@ -36,127 +43,94 @@ next; } -{ - if (current == "") next; - - if ($0 in seen) { - seen[$0] = seen[$0] "\n" current; - } - else { - seen[$0] = current; +/^\| / { + if (NF < 3) { + print "BAD LINE:", $0 > "/dev/stderr"; + exit 2; } + nc = 0; + for (i = 3; i <= NF; ++i) + if ($i != config) + c[nc++] = $i; + for (i = 0; i < nc; ++i) + current = current "," $2 ":" c[i]; + next; } -END { - for (line in seen) { - split(seen[line], setlist, "\n"); - for (i in setlist) { - split(setlist[i], configs, ","); - for (j in configs) { - split(configs[j], temp, ":"); - version = temp[1]; - conf = temp[2]; - - if ((version,conf) in have) continue; - have[version,conf] = 1; +{ + if (current == "") next; - if (version in confs) { - split(confs[version], c, " "); - if (conf < c[1]) { - confs[version] = conf; - for (k = 1; k <= nconfs[version]; ++k) { - confs[version] = confs[version] " " c[k]; - } - } - else { - confs[version] = c[1]; - for (k = 2; k <= nconfs[version]; ++k) { - if (conf < c[k]) break; - confs[version] = confs[version] " " c[k]; - } - confs[version] = confs[version] " " conf; - for (; k <= nconfs[version]; ++k) { - confs[version] = confs[version] " " c[k]; - } - } - ++nconfs[version]; - } - else { - confs[version] = conf; - nconfs[version] = 1; - } + ns = split(seen[$0], s, ","); + nc = split(current, c, ","); + for (i = 1; i <= nc; ++i) { + # Sorted insert. + for (j = 1; j <= ns; ++j) { + if (c[i] < s[j]) { + for (k = ns; k >= j; --k) + s[k + 1] = s[k]; + s[j] = c[i]; + ++ns; + break; } } - for (idx in have) delete have[idx]; - - for (version in confs) { + if (j >= ns) + s[++ns] = c[i]; + } - # Hack: if an element is foo.*/bar and there is also a foo.*, - # then we can omit the foo.*/bar since foo.* matches already. - nc = split(confs[version], c, " "); - for (i = 1; i <= nc; ++i) { - slash = index(c[i], ".*/"); - if (slash > 0) { - beforeslash = substr(c[i], 1, slash + 2 - 1); - for (j = 1; j <= nc; ++j) - if (j != i && c[j] == beforeslash) { - c[i] = c[nc--]; - break; - } - } - } + seen[$0] = s[1]; + for (i = 2; i <= ns; ++i) + seen[$0] = seen[$0] "," s[i]; - idx = version; - for (i = 1; i <= nc; ++i) - idx = idx " " c[i]; + next; +} - if (idx in final) { - final[idx] = final[idx] "\n" line; - } - else { - final[idx] = line; - } - delete confs[version]; - delete nconfs[version]; - } +END { + for (line in seen) { + if (seen[line] in stanzas) + stanzas[seen[line]] = stanzas[seen[line]] "\n" line; + else + stanzas[seen[line]] = line; } - nstanzas = 0; - for (stanza in final) { - if (nstanzas == 0) { - stanzas = stanza; - nstanzas = 1; - continue; - } - split(stanzas, s, "\n"); - if (stanza < s[1]) { - stanzas = stanza; - for (i = 1; i <= nstanzas; ++i) { - stanzas = stanzas "\n" s[i]; + ns = split("", s); + for (configs in stanzas) { + # Sorted insert. + for (j = 1; j <= ns; ++j) + if (configs < s[j]) { + for (k = ns; k >= j; --k) + s[k + 1] = s[k]; + s[j] = configs; + ++ns; + break; } - } - else { - stanzas = s[1]; - for (i = 2; i <= nstanzas; ++i) { - if (stanza < s[i]) break; - stanzas = stanzas "\n" s[i]; - } - stanzas = stanzas "\n" stanza; - for (; i <= nstanzas; ++i) { - stanzas = stanzas "\n" s[i]; - } - } - ++nstanzas; + if (j >= ns) + s[++ns] = configs; } - split(stanzas, order, "\n"); - for (i = 1; i <= nstanzas; ++i) { - stanza = order[i]; - print stanza; + # S[1..NS] is now a sorted list of stanza identifiers. + # STANZAS[ID] contains the lines for that stanza. + # All we have to do is pretty-print the stanza ID, + # and then print the sorted list. + + for (i = 1; i <= ns; ++i) { + # S[I] is a sorted, comma-separated list of SET:CONFIG pairs. + # All we have to do is pretty-print them. + nc = split(s[i], c, ","); + lastvers = ""; + for (j = 1; j <= nc; ++j) { + split(c[j], temp, ":"); + version = temp[1]; + conf = temp[2]; + if (version != lastvers) + printf "%s%s", (lastvers != "" ? "\n| " : ""), version; + printf " %s", conf; + lastvers = version; + } + print ""; outpipe = "sort"; - print final[stanza] | outpipe; + print stanzas[s[i]] | outpipe; close(outpipe); } } |