summary refs log tree commit diff
path: root/shlib-versions
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-09-12 12:24:00 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-09-12 12:24:00 +0000
commitc729e7c13a7bc5ddec6fcaf82712aeff530e0d78 (patch)
tree63daa28a90d84e440a9e7d0841a2b89d8b4659e2 /shlib-versions
parentdc932a24d91eb13c570e82e12f7aba049431dc37 (diff)
downloadglibc-c729e7c13a7bc5ddec6fcaf82712aeff530e0d78.tar.gz
glibc-c729e7c13a7bc5ddec6fcaf82712aeff530e0d78.tar.xz
glibc-c729e7c13a7bc5ddec6fcaf82712aeff530e0d78.zip
Move OS-specific shlib-versions entries to sysdeps files.
This patch moves OS-specific entries in the top-level shlib-versions
file to appropriate sysdeps directories.  I left the entries in
nptl/shlib-versions and nptl_db/shlib-versions unchanged; I think it
can be for those doing non-Linux NPTL-using ports to figure out
whether those entries should actually be OS-independent or should move
to sysdeps.

Given these two patches, I think the only further change needed before
the first column of shlib-versions can be eliminated will be changing
sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions to use %ifdef
to distinguish BE and LE configurations, instead of relying on the
powerpc64-.*-linux.* and powerpc.*le-.*-linux.* patterns.

Tested on x86_64 that the installed shared libraries are unchanged by
this patch.

	* shlib-versions: Remove OS-specific entries.  Moved to files in
	sysdeps.
	* sysdeps/mach/hurd/shlib-versions: New file.
	* sysdeps/unix/sysv/linux/shlib-versions: Likewise.
Diffstat (limited to 'shlib-versions')
-rw-r--r--shlib-versions24
1 files changed, 2 insertions, 22 deletions
diff --git a/shlib-versions b/shlib-versions
index 860fb94133..d34dea8e42 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -1,4 +1,5 @@
-# This file defines the shared library version numbers we will install.
+# 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
@@ -17,31 +18,10 @@
 # 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.
-#
-# Configuration		DEFAULT			Earliest symbol set
-# -------------		---------------		------------------------------
-
-.*-.*-gnu-gnu.*		DEFAULT			GLIBC_2.2.6
 
 # Configuration		Library=version		Earliest symbol set (optional)
 # -------------		---------------		------------------------------
 
-# The interface to -lm depends mostly only on cpu, not on operating system.
-.*-.*-linux.*		libm=6
-.*-.*-gnu-gnu.*		libm=6
-
-# We provide libc.so.6 for Linux kernel versions 2.0 and later.
-.*-.*-linux.*		libc=6
-
-# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
-.*-.*-gnu-gnu.*		libmachuser=1
-
-# libhurduser.so.0.3 corresponds to hurd/*.defs as of 11 June 2002.
-.*-.*-gnu-gnu.*		libhurduser=0.3
-
-# libc.so.0.3 is the first Hurd libc using libio.
-.*-.*-gnu-gnu.*		libc=0.3
-
 # We use the ELF ABI standard name for the default.
 .*-.*-.*		ld=ld.so.1