summaryrefslogtreecommitdiff
path: root/shlib-versions
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 /shlib-versions
parent73a391126d500653bf3cd4c0f67826e75ecc95bf (diff)
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 'shlib-versions')
-rw-r--r--shlib-versions61
1 files changed, 31 insertions, 30 deletions
diff --git a/shlib-versions b/shlib-versions
index d34dea8e42..e05b248e8d 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -1,72 +1,73 @@
# This file (and shlib-versions files in sysdeps directories) defines
# the shared library version numbers we will install.
-# The following lines list filename patterns matching canonical configurations,
-# and the associated versions to use for various libraries. The entire
-# list is processed, with earlier entries taking precedence over later
-# entries. So loose patterns at the end of the list can give defaults.
+# The following lines list the associated versions to use for various
+# libraries. The entire list is processed, with earlier entries
+# taking precedence over later entries (and the files from sysdeps
+# directories coming before those from other subdirectories, which
+# come before this file).
# This file can use cpp-style conditionals starting with % instead of #
# to test the symbols defined in config.h by configure.
-# In the optional third column, there can one or more symbol set names
+# In the optional second column, there can one or more symbol set names
# listed, which must be in ascending version order reading left to right
# and must appear in this same order in the Versions.def file. Each listed
# version subsumes all prior versions back to the previous listed version.
#
-# An entry with DEFAULT in the second column gives a default third column
-# to apply on matching configurations when the matching entry for a particular
-# library has no third column. The defaults must precede the entries they
-# apply to.
+# An entry with DEFAULT in the first column gives a default second
+# column to apply when the matching entry for a particular library has
+# no second column. The defaults must precede the entries they apply
+# to.
-# Configuration Library=version Earliest symbol set (optional)
-# ------------- --------------- ------------------------------
+# Library=version Earliest symbol set (optional)
+# --------------- ------------------------------
# We use the ELF ABI standard name for the default.
-.*-.*-.* ld=ld.so.1
+ld=ld.so.1
# The -ldl interface (see <dlfcn.h>) is the same on all platforms.
-.*-.*-.* libdl=2
+libdl=2
# So far the -lutil interface is the same on all platforms, except for the
# `struct utmp' format, which depends on libc.
-.*-.*-.* libutil=1
+libutil=1
# Version number 2 is used on other systems for the BIND 4.9.5 resolver
# interface.
-.*-.*-.* libresolv=2
+libresolv=2
# Interface revision of nss_* modules. This must match NSS_SHLIB_REVISION
# in nss/nsswitch.h, which determines the library names used for service
# names given in /etc/nsswitch.conf.
-.*-.*-.* libnss_files=2
-.*-.*-.* libnss_dns=2
-.*-.*-.* libnss_compat=2
-.*-.*-.* libnss_nis=2
-.*-.*-.* libnss_nisplus=2
-.*-.*-.* libnss_ldap=2
-.*-.*-.* libnss_hesiod=2
-.*-.*-.* libnss_db=2
+libnss_files=2
+libnss_dns=2
+libnss_compat=2
+libnss_nis=2
+libnss_nisplus=2
+libnss_ldap=2
+libnss_hesiod=2
+libnss_db=2
# Tests for NSS. They must have the same NSS_SHLIB_REVISION number as
# the rest.
-.*-.*-.* libnss_test1=2
+libnss_test1=2
# Version for libnsl with YP and NIS+ functions.
-.*-.*-.* libnsl=1
+libnsl=1
# This defines the shared library version numbers we will install.
-.*-.*-.* libcrypt=1
+libcrypt=1
# The gross patch for programs assuming broken locale implementations.
-.*-.*-.* libBrokenLocale=1
+libBrokenLocale=1
# The real-time library from POSIX.1b.
-.*-.*-.* librt=1
+librt=1
# The asynchronous name lookup library.
-.*-.*-.* libanl=1
+libanl=1
# This defines the libgcc soname version this glibc is to load for
# asynchronous cancellation to work correctly.
-.*-.*-.* libgcc_s=1
+libgcc_s=1