diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 13:02:29 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 13:02:29 -0500 |
| commit | ecb6fb48b765007d910e3f02840a98a67bb25420 (patch) | |
| tree | 6e4a4970a9cf9ccb172e7d20dd547ade531486a1 | |
| parent | 664f8cb9d53fdc002f82a9d69a21a3d5eb63541c (diff) | |
| download | glibc-ecb6fb48b765007d910e3f02840a98a67bb25420.tar.gz glibc-ecb6fb48b765007d910e3f02840a98a67bb25420.tar.xz glibc-ecb6fb48b765007d910e3f02840a98a67bb25420.zip | |
Clean up shlib-versions files
Ports have their own files
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | nptl/ChangeLog | 2 | ||||
| -rw-r--r-- | nptl/shlib-versions | 4 | ||||
| -rw-r--r-- | shlib-versions | 15 |
4 files changed, 4 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index 40f29c0308..c7adea62bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-01-07 Ulrich Drepper <drepper@gmail.com> + * shlib-versions: Remove entries for ports architectures. + * elf/tls-macros.h: Remove support for Alpha and IA-64. Should be in files in ports. * elf/stackguard-macros.h: Remove support for IA-64. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 87d5018637..a2c530a83e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,7 @@ 2012-01-07 Ulrich Drepper <drepper@gmail.com> + * shlib-versions: Remove entries for ports architectures. + In case anyone cares, the IA-64 architecture could move to ports. * sysdeps/ia64/*: Removed. * sysdeps/unix/sysv/linux/ia64/*: Removed. diff --git a/nptl/shlib-versions b/nptl/shlib-versions index 06ac620f06..ee86161fd6 100644 --- a/nptl/shlib-versions +++ b/nptl/shlib-versions @@ -1,10 +1,6 @@ -mips.*-.*-linux.* libpthread=0 GLIBC_2.0 GLIBC_2.2 sparc64.*-.*-linux.* libpthread=0 GLIBC_2.2 sh.*-.*-linux.* libpthread=0 GLIBC_2.2 -ia64.*-.*-linux.* libpthread=0 GLIBC_2.2 -hppa.*-.*-linux.* libpthread=0 GLIBC_2.2 s390x-.*-linux.* libpthread=0 GLIBC_2.2 -cris-.*-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/shlib-versions b/shlib-versions index a7839de462..c530a44dff 100644 --- a/shlib-versions +++ b/shlib-versions @@ -27,7 +27,6 @@ # ------------- --------------- ------------------------------ s390x-.*-linux.* DEFAULT GLIBC_2.2 -cris-.*-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 @@ -53,15 +52,11 @@ sparc.*-.*-.* ABI sparc-@OS@ # The interface to -lm depends mostly only on cpu, not on operating system. sparc64.*-.*-linux.* libm=6 GLIBC_2.2 -alpha.*-.*-linux.* libm=6.1 -ia64-.*-linux.* libm=6.1 GLIBC_2.2 sh.*-.*-linux.* libm=6 GLIBC_2.2 .*-.*-linux.* libm=6 .*-.*-gnu-gnu.* libm=6 # We provide libc.so.6 for Linux kernel versions 2.0 and later. -alpha.*-.*-linux.* libc=6.1 -ia64-.*-linux.* libc=6.1 GLIBC_2.2 sh.*-.*-linux.* libc=6 GLIBC_2.2 sparc64.*-.*-linux.* libc=6 GLIBC_2.2 .*-.*-linux.* libc=6 @@ -79,28 +74,22 @@ sparc64.*-.*-linux.* libc=6 GLIBC_2.2 i.86-.*-linux.* ld=ld-linux.so.2 sparc64.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2 sparc.*-.*-linux.* ld=ld-linux.so.2 -alpha.*-.*-linux.* ld=ld-linux.so.2 sh.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2 -ia64-.*-linux.* ld=ld-linux-ia64.so.2 GLIBC_2.2 s390x-.*-linux.* ld=ld64.so.1 GLIBC_2.2 powerpc64.*-.*-linux.* ld=ld64.so.1 GLIBC_2.3 -cris-.*-linux.* ld=ld.so.1 GLIBC_2.2 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 # The -ldl interface (see <dlfcn.h>) is the same on all platforms. -alpha.*-.*-linux.* libdl=2.1 .*-.*-.* libdl=2 # So far the -lutil interface is the same on all platforms, except for the # `struct utmp' format, which depends on libc. -alpha.*-.*-linux.* libutil=1.1 .*-.*-.* libutil=1 # Version number 2 is used on other systems for the BIND 4.9.5 resolver # interface. -alpha.*-.*-linux.* libresolv=2.1 .*-.*-.* libresolv=2 # Interface revision of nss_* modules. This must match NSS_SHLIB_REVISION @@ -120,16 +109,12 @@ alpha.*-.*-linux.* libresolv=2.1 .*-.*-.* libnss_test1=2 # Version for libnsl with YP and NIS+ functions. -alpha.*-.*-linux.* libnsl=1.1 .*-.*-.* libnsl=1 # This defines the shared library version numbers we will install. -alpha.*-.*-linux.* libcrypt=1.1 .*-.*-.* libcrypt=1 # The gross patch for programs assuming broken locale implementations. -alpha.*-.*-linux.* libBrokenLocale=1.1 -ia64-.*-.* libBrokenLocale=1 GLIBC_2.2 sh.*-.*-.* libBrokenLocale=1 GLIBC_2.2 sparc64.*-.*-.* libBrokenLocale=1 GLIBC_2.2 .*-.*-.* libBrokenLocale=1 |