summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog34
-rw-r--r--sysdeps/hppa/nptl/shlib-versions1
-rw-r--r--sysdeps/hppa/shlib-versions8
-rw-r--r--sysdeps/ia64/nptl/shlib-versions1
-rw-r--r--sysdeps/mips/nptl/shlib-versions1
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/shlib-versions (renamed from sysdeps/aarch64/shlib-versions)0
-rw-r--r--sysdeps/unix/sysv/linux/alpha/shlib-versions (renamed from sysdeps/alpha/shlib-versions)0
-rw-r--r--sysdeps/unix/sysv/linux/arm/shlib-versions (renamed from sysdeps/arm/shlib-versions)0
-rw-r--r--sysdeps/unix/sysv/linux/hppa/shlib-versions9
-rw-r--r--sysdeps/unix/sysv/linux/ia64/shlib-versions (renamed from sysdeps/ia64/shlib-versions)2
-rw-r--r--sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions (renamed from sysdeps/m68k/coldfire/shlib-versions)0
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/shlib-versions (renamed from sysdeps/microblaze/shlib-versions)0
-rw-r--r--sysdeps/unix/sysv/linux/mips/shlib-versions (renamed from sysdeps/mips/shlib-versions)2
-rw-r--r--sysdeps/unix/sysv/linux/tile/shlib-versions (renamed from sysdeps/tile/shlib-versions)0
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/64/shlib-versions1
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions1
-rw-r--r--sysdeps/x86_64/64/shlib-versions3
-rw-r--r--sysdeps/x86_64/x32/shlib-versions3
18 files changed, 49 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c0b5aeb5c..d2bc3084bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2014-07-17  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/aarch64/shlib-versions: Move to ...
+	* sysdeps/unix/sysv/linux/aarch64/shlib-versions: ... here.
+	* sysdeps/alpha/shlib-versions: Move to ...
+	* sysdeps/unix/sysv/linux/alpha/shlib-versions: ... here.
+	* sysdeps/arm/shlib-versions: Move to ...
+	* sysdeps/unix/sysv/linux/arm/shlib-versions: ... here.
+	* sysdeps/hppa/shlib-versions: Move all contents except for
+	libgcc_s entry to ...
+	* sysdeps/unix/sysv/linux/hppa/shlib-versions: ... here.  Merge in
+	entry from ...
+	* sysdeps/hppa/nptl/shlib-versions: ... here.  Remove file.
+	* sysdeps/ia64/shlib-versions: Move to ...
+	* sysdeps/unix/sysv/linux/ia64/shlib-versions: ... here.  Merge in
+	entry from ...
+	* sysdeps/ia64/nptl/shlib-versions: ... here.  Remove file.
+	* sysdeps/m68k/coldfire/shlib-versions: Move to ...
+	* sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions: ... here.
+	* sysdeps/microblaze/shlib-versions: Move to ...
+	* sysdeps/unix/sysv/linux/microblaze/shlib-versions: ... here.
+	* sysdeps/mips/shlib-versions: Move to ...
+	* sysdeps/unix/sysv/linux/mips/shlib-versions: ... here.  Merge in
+	entry from ...
+	* sysdeps/mips/nptl/shlib-versions: ... here.  Remove file.
+	* sysdeps/tile/shlib-versions: Move to ...
+	* sysdeps/unix/sysv/linux/tile/shlib-versions: ... here.
+	* sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: Merge in entry
+	from ...
+	* sysdeps/x86_64/64/shlib-versions: ... here.  Remove file.
+	* sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: Merge in
+	entry from ...
+	* sysdeps/x86_64/x32/shlib-versions: ... here.  Remove file.
+
 2014-07-17  Will Newton  <will.newton@linaro.org>
 
 	* sysdeps/arm/bits/atomic.h
diff --git a/sysdeps/hppa/nptl/shlib-versions b/sysdeps/hppa/nptl/shlib-versions
deleted file mode 100644
index adc26364b1..0000000000
--- a/sysdeps/hppa/nptl/shlib-versions
+++ /dev/null
@@ -1 +0,0 @@
-hppa.*-.*-linux.*      libpthread=0            GLIBC_2.2
diff --git a/sysdeps/hppa/shlib-versions b/sysdeps/hppa/shlib-versions
index 6b9225c925..ae3a3f195f 100644
--- a/sysdeps/hppa/shlib-versions
+++ b/sysdeps/hppa/shlib-versions
@@ -1,9 +1 @@
-hppa.*-.*-.*		libm=6			GLIBC_2.2
-
-hppa.*-.*-.*		libc=6			GLIBC_2.2
-
-hppa.*-.*-.*		ld=ld.so.1		GLIBC_2.2
-
-hppa-.*-.*		libBrokenLocale=1	GLIBC_2.2
-
 hppa.*-.*-.*		libgcc_s=4
diff --git a/sysdeps/ia64/nptl/shlib-versions b/sysdeps/ia64/nptl/shlib-versions
deleted file mode 100644
index 90015eb151..0000000000
--- a/sysdeps/ia64/nptl/shlib-versions
+++ /dev/null
@@ -1 +0,0 @@
-ia64.*-.*-linux.*	libpthread=0		GLIBC_2.2
diff --git a/sysdeps/mips/nptl/shlib-versions b/sysdeps/mips/nptl/shlib-versions
deleted file mode 100644
index 97e41aa904..0000000000
--- a/sysdeps/mips/nptl/shlib-versions
+++ /dev/null
@@ -1 +0,0 @@
-mips.*-.*-linux.*	libpthread=0		GLIBC_2.0 GLIBC_2.2
diff --git a/sysdeps/aarch64/shlib-versions b/sysdeps/unix/sysv/linux/aarch64/shlib-versions
index 67f19119aa..67f19119aa 100644
--- a/sysdeps/aarch64/shlib-versions
+++ b/sysdeps/unix/sysv/linux/aarch64/shlib-versions
diff --git a/sysdeps/alpha/shlib-versions b/sysdeps/unix/sysv/linux/alpha/shlib-versions
index cd4b9af78d..cd4b9af78d 100644
--- a/sysdeps/alpha/shlib-versions
+++ b/sysdeps/unix/sysv/linux/alpha/shlib-versions
diff --git a/sysdeps/arm/shlib-versions b/sysdeps/unix/sysv/linux/arm/shlib-versions
index 1ac597abbb..1ac597abbb 100644
--- a/sysdeps/arm/shlib-versions
+++ b/sysdeps/unix/sysv/linux/arm/shlib-versions
diff --git a/sysdeps/unix/sysv/linux/hppa/shlib-versions b/sysdeps/unix/sysv/linux/hppa/shlib-versions
new file mode 100644
index 0000000000..ee46e4ab00
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/hppa/shlib-versions
@@ -0,0 +1,9 @@
+hppa.*-.*-.*		libm=6			GLIBC_2.2
+
+hppa.*-.*-.*		libc=6			GLIBC_2.2
+
+hppa.*-.*-.*		ld=ld.so.1		GLIBC_2.2
+
+hppa-.*-.*		libBrokenLocale=1	GLIBC_2.2
+
+hppa.*-.*-linux.*	libpthread=0		GLIBC_2.2
diff --git a/sysdeps/ia64/shlib-versions b/sysdeps/unix/sysv/linux/ia64/shlib-versions
index b41f6c2aa3..c8e1482892 100644
--- a/sysdeps/ia64/shlib-versions
+++ b/sysdeps/unix/sysv/linux/ia64/shlib-versions
@@ -4,3 +4,5 @@ ia64-.*-linux.*		libm=6.1		GLIBC_2.2
 ia64-.*-linux.*		ld=ld-linux-ia64.so.2	GLIBC_2.2
 
 ia64-.*-.*		libBrokenLocale=1	GLIBC_2.2
+
+ia64.*-.*-linux.*	libpthread=0		GLIBC_2.2
diff --git a/sysdeps/m68k/coldfire/shlib-versions b/sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions
index f4c68b2a51..f4c68b2a51 100644
--- a/sysdeps/m68k/coldfire/shlib-versions
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions
diff --git a/sysdeps/microblaze/shlib-versions b/sysdeps/unix/sysv/linux/microblaze/shlib-versions
index 6ec43db15b..6ec43db15b 100644
--- a/sysdeps/microblaze/shlib-versions
+++ b/sysdeps/unix/sysv/linux/microblaze/shlib-versions
diff --git a/sysdeps/mips/shlib-versions b/sysdeps/unix/sysv/linux/mips/shlib-versions
index b153732c27..d1414ede64 100644
--- a/sysdeps/mips/shlib-versions
+++ b/sysdeps/unix/sysv/linux/mips/shlib-versions
@@ -23,3 +23,5 @@ mips.*-.*-linux.*	libnss_hesiod=2		GLIBC_2.0 GLIBC_2.2
 mips.*-.*-linux.*	libnsl=1		GLIBC_2.0 GLIBC_2.2
 
 mips.*-.*-linux.*	librt=1			GLIBC_2.0 GLIBC_2.2
+
+mips.*-.*-linux.*	libpthread=0		GLIBC_2.0 GLIBC_2.2
diff --git a/sysdeps/tile/shlib-versions b/sysdeps/unix/sysv/linux/tile/shlib-versions
index f50868ff64..f50868ff64 100644
--- a/sysdeps/tile/shlib-versions
+++ b/sysdeps/unix/sysv/linux/tile/shlib-versions
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
index 5093c4c18b..90ea1b79af 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
+++ b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
@@ -1,3 +1,4 @@
 # Configuration		DEFAULT			Earliest symbol set
 # -------------		---------------		------------------------------
+x86_64-.*-linux.*	DEFAULT			GLIBC_2.2.5
 x86_64-.*-linux.*	libpthread=0		GLIBC_2.2.5
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
index 8fcad2e566..8dd73e487d 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
@@ -1,3 +1,4 @@
 # Configuration		DEFAULT			Earliest symbol set
 # -------------		---------------		------------------------------
+x86_64-.*-linux.*	DEFAULT			GLIBC_2.16
 x86_64-.*-linux.*	libpthread=0		GLIBC_2.16
diff --git a/sysdeps/x86_64/64/shlib-versions b/sysdeps/x86_64/64/shlib-versions
deleted file mode 100644
index 50dd908403..0000000000
--- a/sysdeps/x86_64/64/shlib-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration		DEFAULT			Earliest symbol set
-# -------------		---------------		------------------------------
-x86_64-.*-linux.*	DEFAULT			GLIBC_2.2.5
diff --git a/sysdeps/x86_64/x32/shlib-versions b/sysdeps/x86_64/x32/shlib-versions
deleted file mode 100644
index 223dfb65b6..0000000000
--- a/sysdeps/x86_64/x32/shlib-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration		DEFAULT			Earliest symbol set
-# -------------		---------------		------------------------------
-x86_64-.*-linux.*	DEFAULT			GLIBC_2.16