summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions6
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions3
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/64/shlib-versions3
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions3
5 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 241cdf52ff..3195d51352 100644
--- 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 1f5493babc..bc6debaf69 100644
--- 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 9de0608fbc..669a0c9869 100644
--- 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 897b7e0e1b..7f87a8bd17 100644
--- 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 df96afab38..0ab2e27224 100644
--- 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