From 0b254d8f3db5deb23e57d5d644d7a9b2ca6df3f2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 14 May 2012 16:23:57 -0700 Subject: [PATCH] Add sysdeps/x86_64/{64,x32}/shlib-versions --- ChangeLog | 6 ++++++ nptl/ChangeLog | 6 ++++++ nptl/shlib-versions | 1 - nptl/sysdeps/x86_64/64/shlib-versions | 3 +++ nptl/sysdeps/x86_64/x32/shlib-versions | 3 +++ shlib-versions | 2 -- sysdeps/x86_64/64/shlib-versions | 4 ++++ sysdeps/x86_64/x32/shlib-versions | 4 ++++ 8 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 nptl/sysdeps/x86_64/64/shlib-versions create mode 100644 nptl/sysdeps/x86_64/x32/shlib-versions create mode 100644 sysdeps/x86_64/64/shlib-versions create mode 100644 sysdeps/x86_64/x32/shlib-versions diff --git a/ChangeLog b/ChangeLog index 35bf736..538c5b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-14 H.J. Lu + + * 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 * sysdeps/unix/sysv/linux/dl-osinfo.h (dl_fatal): Function removed. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index b087a37..5feb67d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,11 @@ 2012-05-14 H.J. Lu + * 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 + * 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 ee86161..e49e7ca 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 0000000..5093c4c --- /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 0000000..8fcad2e --- /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 840e08f..b8ed1e9 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 0000000..c797487 --- /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 0000000..757a35d --- /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 -- 2.7.4