Remove shlib-versions entries redundant with DEFAULT entries.

When a shlib-versions file has a DEFAULT line, it's not necessary to
specify the same default minimum symbol version on the lines for
individual libraries.  If those lines otherwise duplicate the default
SONAME for the library in question, they can be removed completely.

This patch makes such cleanups: version entries for ld.so are removed
(leaving just the definition of the architecture-specific dynamic
linker name) and entries for libpthread are removed completely (since
the default is libpthread.so.0).

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

There are various architectures (hppa, ia64, mips, sh, sparc64) that
define minimum symbol versions (or in the case of mips, omission of
symbol versions) only for particular libraries without a DEFAULT line.
None of these are equivalent to something simpler with a DEFAULT line
because all have some other libraries, not explicitly mentioned, with
symbol versions that would be omitted were such a line used.  In the
mips case I'm pretty sure it was a mistake not to omit the 2.1 symbols
for libthread_db; for the others I don't know if it was a mistake or
deliberate that some symbols in various libraries have 2.0 or 2.1
versions despite other libraries having a 2.2 minimum.

This concludes the shlib-versions cleanups I'm aware of.

	* sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions: Do not
	specify symbol version for ld.so.  Do not include entry for
	libpthread.
	* sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 241cdf52ffd777379cd9c3583e5c6e58a2e16a4b..3195d51352cb9eaae1c09af9fc4a0fa9b31b4b53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-09-26  Joseph Myers  <joseph@codesourcery.com>
 
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions: Do not
+       specify symbol version for ld.so.  Do not include entry for
+       libpthread.
+       * sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions: Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: Likewise.
+
        [BZ #14171]
        * Makeconfig [$(build-shared) = yes]
        ($(common-objpfx)soversions.mk): Don't handle SONAMEs specified in

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
index 1f5493babc9254c39004cde1a815f59ede8e5d7b..bc6debaf6970fff8ead4b98c31b874edab8c8d8f 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
@@ -1,9 +1,7 @@
 %ifdef HAVE_ELFV2_ABI
 DEFAULT                        GLIBC_2.17
-ld=ld64.so.2           GLIBC_2.17
-libpthread=0           GLIBC_2.17
+ld=ld64.so.2
 %else
 DEFAULT                        GLIBC_2.3
-ld=ld64.so.1           GLIBC_2.3
-libpthread=0           GLIBC_2.3
+ld=ld64.so.1
 %endif

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions b/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions
index 9de0608fbcfe29aba3866d87c20746510133c530..669a0c9869506ba4dede2d47fde7663541d33421 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions
@@ -1,3 +1,2 @@
 DEFAULT                        GLIBC_2.2
-ld=ld64.so.1           GLIBC_2.2
-libpthread=0           GLIBC_2.2
+ld=ld64.so.1

diff --git a/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
index 897b7e0e1b2578059ca2a32f1bd81e0ca67b9498..7f87a8bd17eb920bd2a04c10fddef7fcc85ed297 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
+++ b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
@@ -1,5 +1,4 @@
 # DEFAULT                      Earliest symbol set
 # ---------------              ------------------------------
 DEFAULT                        GLIBC_2.2.5
-ld=ld-linux-x86-64.so.2        GLIBC_2.2.5
-libpthread=0           GLIBC_2.2.5
+ld=ld-linux-x86-64.so.2

diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
index df96afab38b26797946f41758e421a2ea906fb5e..0ab2e272243c8850b15903a3495dd7d00ed83399 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
@@ -1,5 +1,4 @@
 # DEFAULT                      Earliest symbol set
 # ---------------              ------------------------------
 DEFAULT                        GLIBC_2.16
-ld=ld-linux-x32.so.2   GLIBC_2.16
-libpthread=0           GLIBC_2.16
+ld=ld-linux-x32.so.2