summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/shlib-versions1
-rw-r--r--nptl/sysdeps/x86_64/64/shlib-versions3
-rw-r--r--nptl/sysdeps/x86_64/x32/shlib-versions3
-rw-r--r--shlib-versions2
-rw-r--r--sysdeps/x86_64/64/shlib-versions4
-rw-r--r--sysdeps/x86_64/x32/shlib-versions4
8 files changed, 26 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 35bf7361c9..538c5b22c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * shlib-versions: Move x86_64-.*-linux.* entries to ...
+ * sysdeps/x86_64/64/shlib-versions: Here. New file.
+ * sysdeps/x86_64/x32/shlib-versions: New file.
+
2012-05-14 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/dl-osinfo.h (dl_fatal): Function removed.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b087a37daf..5feb67d2bf 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,11 @@
2012-05-14 H.J. Lu <hongjiu.lu@intel.com>
+ * shlib-versions: Move x86_64-.*-linux.* entry to ...
+ * sysdeps/x86_64/64/shlib-versions: Here. New file.
+ * sysdeps/x86_64/x32/shlib-versions: New file.
+
+2012-05-14 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: Define x32
__SIZEOF_PTHREAD_XXX_T.
(__pthread_internal_list): Check __x86_64__ instead of __WORDSIZE.
diff --git a/nptl/shlib-versions b/nptl/shlib-versions
index ee86161fd6..e49e7ca419 100644
--- a/nptl/shlib-versions
+++ b/nptl/shlib-versions
@@ -1,6 +1,5 @@
sparc64.*-.*-linux.* libpthread=0 GLIBC_2.2
sh.*-.*-linux.* libpthread=0 GLIBC_2.2
s390x-.*-linux.* libpthread=0 GLIBC_2.2
-x86_64-.*-linux.* libpthread=0 GLIBC_2.2.5
powerpc64-.*-linux.* libpthread=0 GLIBC_2.3
.*-.*-linux.* libpthread=0
diff --git a/nptl/sysdeps/x86_64/64/shlib-versions b/nptl/sysdeps/x86_64/64/shlib-versions
new file mode 100644
index 0000000000..5093c4c18b
--- /dev/null
+++ b/nptl/sysdeps/x86_64/64/shlib-versions
@@ -0,0 +1,3 @@
+# Configuration DEFAULT Earliest symbol set
+# ------------- --------------- ------------------------------
+x86_64-.*-linux.* libpthread=0 GLIBC_2.2.5
diff --git a/nptl/sysdeps/x86_64/x32/shlib-versions b/nptl/sysdeps/x86_64/x32/shlib-versions
new file mode 100644
index 0000000000..8fcad2e566
--- /dev/null
+++ b/nptl/sysdeps/x86_64/x32/shlib-versions
@@ -0,0 +1,3 @@
+# Configuration DEFAULT Earliest symbol set
+# ------------- --------------- ------------------------------
+x86_64-.*-linux.* libpthread=0 GLIBC_2.16
diff --git a/shlib-versions b/shlib-versions
index 840e08fbd1..b8ed1e9b7d 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -27,7 +27,6 @@
# ------------- --------------- ------------------------------
s390x-.*-linux.* DEFAULT GLIBC_2.2
-x86_64-.*-linux.* DEFAULT GLIBC_2.2.5
powerpc64-.*-linux.* DEFAULT GLIBC_2.3
.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6
@@ -77,7 +76,6 @@ sparc.*-.*-linux.* ld=ld-linux.so.2
sh.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2
s390x-.*-linux.* ld=ld64.so.1 GLIBC_2.2
powerpc64.*-.*-linux.* ld=ld64.so.1 GLIBC_2.3
-x86_64-.*-linux.* ld=ld-linux-x86-64.so.2 GLIBC_2.2.5
# We use the ELF ABI standard name for the default.
.*-.*-.* ld=ld.so.1
diff --git a/sysdeps/x86_64/64/shlib-versions b/sysdeps/x86_64/64/shlib-versions
new file mode 100644
index 0000000000..c79748734e
--- /dev/null
+++ b/sysdeps/x86_64/64/shlib-versions
@@ -0,0 +1,4 @@
+# Configuration DEFAULT Earliest symbol set
+# ------------- --------------- ------------------------------
+x86_64-.*-linux.* DEFAULT GLIBC_2.2.5
+x86_64-.*-linux.* ld=ld-linux-x86-64.so.2 GLIBC_2.2.5
diff --git a/sysdeps/x86_64/x32/shlib-versions b/sysdeps/x86_64/x32/shlib-versions
new file mode 100644
index 0000000000..757a35d9e3
--- /dev/null
+++ b/sysdeps/x86_64/x32/shlib-versions
@@ -0,0 +1,4 @@
+# Configuration DEFAULT Earliest symbol set
+# ------------- --------------- ------------------------------
+x86_64-.*-linux.* DEFAULT GLIBC_2.16
+x86_64-.*-linux.* ld=ld-linux-x32.so.2 GLIBC_2.16