AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move OS-specific shlib-versions entries to sysdeps files.

Browse Source 
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.
This commit is contained in:
Joseph Myers 2014-09-12 12:24:00 +00:00
parent dc932a24d9
commit c729e7c13a
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2014-09-12 Joseph Myers <joseph@codesourcery.com> 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. * nptl/shlib-versions: Remove architecture-specific entries.
Moved to files in sysdeps. Moved to files in sysdeps.
* shlib-versions: Likewise. * shlib-versions: Likewise.

24
shlib-versions
View File

@ -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, # The following lines list filename patterns matching canonical configurations,
# and the associated versions to use for various libraries. The entire # 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 # to apply on matching configurations when the matching entry for a particular
# library has no third column. The defaults must precede the entries they # library has no third column. The defaults must precede the entries they
# apply to. # apply to.
#
# Configuration DEFAULT Earliest symbol set
# ------------- --------------- ------------------------------
.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6
# Configuration Library=version Earliest symbol set (optional) # 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. # We use the ELF ABI standard name for the default.
.*-.*-.* ld=ld.so.1 .*-.*-.* ld=ld.so.1

12
sysdeps/mach/hurd/shlib-versions Normal file
View File

@ -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
sysdeps/unix/sysv/linux/shlib-versions Normal file
View File

@ -0,0 +1,2 @@
.*-.*-linux.* libm=6
.*-.*-linux.* libc=6