Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Joseph Myers committed Sep 12, 2014
1 parent dc932a2 commit c729e7c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 22 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
@@ -1,5 +1,10 @@
2014-09-12 Joseph Myers <joseph@codesourcery.com>

* 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.

* nptl/shlib-versions: Remove architecture-specific entries.
Moved to files in sysdeps.
* shlib-versions: Likewise.
Expand Down
24 changes: 2 additions & 22 deletions 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
Expand All @@ -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

Expand Down
12 changes: 12 additions & 0 deletions sysdeps/mach/hurd/shlib-versions
@@ -0,0 +1,12 @@
.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6

.*-.*-gnu-gnu.* libm=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
2 changes: 2 additions & 0 deletions sysdeps/unix/sysv/linux/shlib-versions
@@ -0,0 +1,2 @@
.*-.*-linux.* libm=6
.*-.*-linux.* libc=6

0 comments on commit c729e7c

Please sign in to comment.