This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-19-gc729e7c
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Sep 2014 12:24:57 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-19-gc729e7c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via c729e7c13a7bc5ddec6fcaf82712aeff530e0d78 (commit)
from dc932a24d91eb13c570e82e12f7aba049431dc37 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c729e7c13a7bc5ddec6fcaf82712aeff530e0d78
commit c729e7c13a7bc5ddec6fcaf82712aeff530e0d78
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Sep 12 12:24:00 2014 +0000
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.
diff --git a/ChangeLog b/ChangeLog
index 6cd6c68..fdbe22f 100644
--- a/ChangeLog
+++ b/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.
diff --git a/shlib-versions b/shlib-versions
index 860fb94..d34dea8 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
diff --git a/sysdeps/mach/hurd/shlib-versions b/sysdeps/mach/hurd/shlib-versions
new file mode 100644
index 0000000..f79c633
--- /dev/null
+++ b/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
diff --git a/sysdeps/unix/sysv/linux/shlib-versions b/sysdeps/unix/sysv/linux/shlib-versions
new file mode 100644
index 0000000..2c06a8e
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/shlib-versions
@@ -0,0 +1,2 @@
+.*-.*-linux.* libm=6
+.*-.*-linux.* libc=6
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
shlib-versions | 24 ++----------------------
sysdeps/mach/hurd/shlib-versions | 12 ++++++++++++
sysdeps/unix/sysv/linux/shlib-versions | 2 ++
4 files changed, 21 insertions(+), 22 deletions(-)
create mode 100644 sysdeps/mach/hurd/shlib-versions
create mode 100644 sysdeps/unix/sysv/linux/shlib-versions
hooks/post-receive
--
GNU C Library master sources