diff options
author | Roland McGrath <roland@gnu.org> | 2005-02-16 12:31:10 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2005-02-16 12:31:10 +0000 |
commit | 833861be818bb5d45ab0c47370b84068dfb2fedf (patch) | |
tree | 2f1754a415c378f6b067f9158cc42df24d4641d2 /scripts | |
parent | c397a0064061e28a00eea873669e59f3983db791 (diff) |
import later fedora-branch tweaks
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib-names.awk | 66 | ||||
-rw-r--r-- | scripts/soversions.awk | 68 |
2 files changed, 17 insertions, 117 deletions
diff --git a/scripts/lib-names.awk b/scripts/lib-names.awk deleted file mode 100644 index 77e6668515..0000000000 --- a/scripts/lib-names.awk +++ /dev/null @@ -1,66 +0,0 @@ -# awk script for soversions.i -> gnu/lib-names.h; see Makeconfig. - -$1 != "DEFAULT" { multi = 1 } - -# -{ - lib = $2; - version = $3; - if ($3 !~ /^[0-9]/) { - soname = $3; - extra = $3; - sub(/\.so.*$/, "", extra); - } - else { - soname = lib ".so." $3; - extra = ""; - } - soname = "\"" soname "\""; - lib = toupper(lib); - extra = toupper(extra); - gsub(/-/, "_", lib); - gsub(/-/, "_", extra); - macros[$1 FS lib "_SO"] = soname; - if (extra) - macros[$1 FS extra "_SO"] = soname; -} - -END { - print "/* This file is automatically generated."; - print " It defines macros to allow user program to find the shared"; - print " library files which come as part of GNU libc. */"; - print "#ifndef __GNU_LIB_NAMES_H"; - print "#define __GNU_LIB_NAMES_H 1"; - print ""; - - pfx = multi ? "# define " : "#define "; - for (elt in macros) { - split(elt, x); - line = sprintf("%-40s%s", pfx x[2], macros[elt]); - if (x[1] in lines) - lines[x[1]] = lines[x[1]] "\n" line; - else - lines[x[1]] = line; - } - - if (multi) { - # Print these in a fixed order so the result is identical - # on both sides of the coin. - if (!("WORDSIZE32" in lines)) - lines["WORDSIZE32"] = lines["DEFAULT"]; - if (!("WORDSIZE64" in lines)) - lines["WORDSIZE64"] = lines["DEFAULT"]; - print "#include <bits/wordsize.h>\n"; - print "#if __WORDSIZE == 32"; - cmd = "LC_ALL=C sort"; print lines["WORDSIZE32"] | cmd; close(cmd); - print "#else" - cmd = "LC_ALL=C sort"; print lines["WORDSIZE64"] | cmd; close(cmd); - print "#endif"; - } - else { - cmd = "LC_ALL=C sort"; print lines["DEFAULT"] | cmd; close(cmd); - } - - print ""; - print "#endif /* gnu/lib-names.h */" -} diff --git a/scripts/soversions.awk b/scripts/soversions.awk index 32ce076ba9..6207088514 100644 --- a/scripts/soversions.awk +++ b/scripts/soversions.awk @@ -1,27 +1,15 @@ -# awk script for shlib-versions.v -> soversions.i; see Makeconfig. +# awk script for shlib-versions.v.i -> soversions.i; see Makeconfig. -BEGIN { - config = cpu "-" vendor "-" os; - configs[config] = "DEFAULT"; -} - -{ thiscf = $1 } - -$2 ~ /WORDSIZE[3264]/ { - if ((config ~ thiscf) && !othercf) { - othercf = $3; - sub(/@CPU@/, cpu, othercf); - sub(/@VENDOR@/, vendor, othercf); - sub(/@OS@/, os, othercf); - configs[othercf] = $2; - } - next; -} +# Only lines matching `config' (set with -v) are relevant to us. +config !~ $1 { next } # Obey the first matching DEFAULT line. $2 == "DEFAULT" { - $1 = $2 = ""; - default_set[++ndefault_set] = thiscf "\n" $0; + if (!matched_default) { + matched_default = 1; + $1 = $2 = ""; + default_setname = $0; + } next } @@ -31,42 +19,20 @@ $2 == "DEFAULT" { lib = number = $2; sub(/=.*$/, "", lib); sub(/^.*=/, "", number); - if ((thiscf FS lib) in numbers) next; - numbers[thiscf FS lib] = number; - order[thiscf FS lib] = ++order_n; + if (lib in numbers) next; + numbers[lib] = number; if (NF > 2) { $1 = $2 = ""; - versions[thiscf FS lib] = $0 + versions[lib] = $0 } } END { - for (elt in numbers) { - split(elt, x); - cf = x[1]; - lib = x[2]; - 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; - } - } - } - for (c in lines) { - print lines[c] + for (lib in numbers) { + set = (lib in versions) ? versions[lib] : default_setname; + if (set) + print lib, numbers[lib], set; + else + print lib, numbers[lib]; } } |