aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-09-12 12:28:47 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-09-12 12:28:47 +0000
commitba90e05052ce57db51e3cb18978614fd0db5c7ef (patch)
tree513e8a0d4bf6d7a8b0a0f4794c59ec61126d58b7 /scripts
parent73a391126d500653bf3cd4c0f67826e75ecc95bf (diff)
downloadglibc-ba90e05052ce57db51e3cb18978614fd0db5c7ef.tar
glibc-ba90e05052ce57db51e3cb18978614fd0db5c7ef.tar.gz
glibc-ba90e05052ce57db51e3cb18978614fd0db5c7ef.tar.bz2
glibc-ba90e05052ce57db51e3cb18978614fd0db5c7ef.zip
Remove configuration name patterns from shlib-versions.
This patch removes the first column (patterns matching configuration names) from shlib-versions, leaving shlib-versions entry selection based purely on sysdeps directories. An implication of this removal is that the default for any non-Linux ports using NPTL will be the same SONAMEs for NPTL libraries as for Linux (as those defaults, previously limited to .*-.*-linux.*, are left in nptl/shlib-versions and nptl_db/shlib-versions). Special host_os handling in configure.ac that was purely for shlib-versions is removed. (The host_os setting is still used for libc-abis - see <https://sourceware.org/ml/libc-alpha/2014-01/msg00375.html> regarding that - but no entries there are affected by this change.) Tested on x86_64 and x86 that the installed shared libraries are unchanged by this patch. * scripts/soversions.awk: Do not handle configuration names. * Makeconfig ($(common-objpfx)soversions.i): Do not pass cpu, vendor and os variables to soversions.awk. * configure.ac: Do not modify gnu-* host_os. * configure: Regenerated * shlib-versions: Remove first column with configuration names. * nptl/shlib-versions: Likewise. * nptl_db/shlib-versions: Likewise. * sysdeps/hppa/shlib-versions: Likewise. * sysdeps/m68k/shlib-versions: Likewise. * sysdeps/mach/hurd/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/aarch64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/alpha/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/arm/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/hppa/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/ia64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/microblaze/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/mips/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/sh/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/tile/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: Likewise. libidn/ChangeLog: * shlib-versions: Remove first column with configuration names.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/soversions.awk64
1 files changed, 23 insertions, 41 deletions
diff --git a/scripts/soversions.awk b/scripts/soversions.awk
index adba1556f0..dbc90590e8 100644
--- a/scripts/soversions.awk
+++ b/scripts/soversions.awk
@@ -1,59 +1,41 @@
# awk script for shlib-versions.v -> soversions.i; see Makeconfig.
-BEGIN {
- config = cpu "-" vendor "-" os;
- configs[config] = "DEFAULT";
-}
-
-{ thiscf = $1 }
-
# Obey the first matching DEFAULT line.
-$2 == "DEFAULT" {
- $1 = $2 = "";
- default_set[++ndefault_set] = thiscf "\n" $0;
+$1 == "DEFAULT" {
+ $1 = "";
+ default_set[++ndefault_set] = $0;
next
}
# Collect all lib lines before emitting anything, so DEFAULT
# can be interspersed.
{
- lib = number = $2;
+ lib = number = $1;
sub(/=.*$/, "", lib);
sub(/^.*=/, "", number);
- if ((thiscf FS lib) in numbers) next;
- numbers[thiscf FS lib] = number;
- order[thiscf FS lib] = ++order_n;
- if (NF > 2) {
- $1 = $2 = "";
- versions[thiscf FS lib] = $0
+ if (lib in numbers) next;
+ numbers[lib] = number;
+ order[lib] = ++order_n;
+ if (NF > 1) {
+ $1 = "";
+ 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 (lib in numbers) {
+ if (lib in versions)
+ set = versions[lib];
+ else {
+ set = default_setname;
+ if (ndefault_set >= 1)
+ set = default_set[1];
+ }
+ line = set ? (lib FS numbers[lib] FS set) : (lib FS numbers[lib]);
+ if (!(lib in lineorder) || order[lib] < lineorder[lib]) {
+ lineorder[lib] = order[lib];
+ lines[lib] = "DEFAULT" FS line;
+ }
}
for (c in lines) {
print lines[c]