From ba90e05052ce57db51e3cb18978614fd0db5c7ef Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 12 Sep 2014 12:28:47 +0000 Subject: Remove configuration name patterns from shlib-versions. This patch removes the first column (patterns matching configuration names) from shlib-versions, leaving shlib-versions entry selection based purely on sysdeps directories. An implication of this removal is that the default for any non-Linux ports using NPTL will be the same SONAMEs for NPTL libraries as for Linux (as those defaults, previously limited to .*-.*-linux.*, are left in nptl/shlib-versions and nptl_db/shlib-versions). Special host_os handling in configure.ac that was purely for shlib-versions is removed. (The host_os setting is still used for libc-abis - see regarding that - but no entries there are affected by this change.) Tested on x86_64 and x86 that the installed shared libraries are unchanged by this patch. * scripts/soversions.awk: Do not handle configuration names. * Makeconfig ($(common-objpfx)soversions.i): Do not pass cpu, vendor and os variables to soversions.awk. * configure.ac: Do not modify gnu-* host_os. * configure: Regenerated * shlib-versions: Remove first column with configuration names. * nptl/shlib-versions: Likewise. * nptl_db/shlib-versions: Likewise. * sysdeps/hppa/shlib-versions: Likewise. * sysdeps/m68k/shlib-versions: Likewise. * sysdeps/mach/hurd/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/aarch64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/alpha/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/arm/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/hppa/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/ia64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/microblaze/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/mips/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/sh/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/tile/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: Likewise. * sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: Likewise. libidn/ChangeLog: * shlib-versions: Remove first column with configuration names. --- sysdeps/hppa/shlib-versions | 2 +- sysdeps/m68k/shlib-versions | 2 +- sysdeps/mach/hurd/shlib-versions | 10 +++---- sysdeps/unix/sysv/linux/aarch64/shlib-versions | 6 ++-- sysdeps/unix/sysv/linux/alpha/shlib-versions | 18 ++++++------ sysdeps/unix/sysv/linux/arm/shlib-versions | 6 ++-- sysdeps/unix/sysv/linux/hppa/shlib-versions | 10 +++---- sysdeps/unix/sysv/linux/ia64/shlib-versions | 10 +++---- .../unix/sysv/linux/m68k/coldfire/shlib-versions | 2 +- sysdeps/unix/sysv/linux/microblaze/shlib-versions | 2 +- sysdeps/unix/sysv/linux/mips/shlib-versions | 32 +++++++++++----------- .../sysv/linux/powerpc/powerpc64/shlib-versions | 8 +++--- .../unix/sysv/linux/s390/s390-64/shlib-versions | 4 +-- sysdeps/unix/sysv/linux/sh/shlib-versions | 10 +++---- sysdeps/unix/sysv/linux/shlib-versions | 4 +-- .../unix/sysv/linux/sparc/sparc32/shlib-versions | 2 +- .../unix/sysv/linux/sparc/sparc64/shlib-versions | 10 +++---- sysdeps/unix/sysv/linux/tile/shlib-versions | 2 +- sysdeps/unix/sysv/linux/x86_64/64/shlib-versions | 8 +++--- sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions | 8 +++--- 20 files changed, 78 insertions(+), 78 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/hppa/shlib-versions b/sysdeps/hppa/shlib-versions index ae3a3f195f..34e9347125 100644 --- a/sysdeps/hppa/shlib-versions +++ b/sysdeps/hppa/shlib-versions @@ -1 +1 @@ -hppa.*-.*-.* libgcc_s=4 +libgcc_s=4 diff --git a/sysdeps/m68k/shlib-versions b/sysdeps/m68k/shlib-versions index b65b00b212..c8db251c22 100644 --- a/sysdeps/m68k/shlib-versions +++ b/sysdeps/m68k/shlib-versions @@ -1 +1 @@ -m68k-.*-linux.* libgcc_s=2 +libgcc_s=2 diff --git a/sysdeps/mach/hurd/shlib-versions b/sysdeps/mach/hurd/shlib-versions index f79c6331b5..edbc3014a6 100644 --- a/sysdeps/mach/hurd/shlib-versions +++ b/sysdeps/mach/hurd/shlib-versions @@ -1,12 +1,12 @@ -.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6 +DEFAULT GLIBC_2.2.6 -.*-.*-gnu-gnu.* libm=6 +libm=6 # libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release. -.*-.*-gnu-gnu.* libmachuser=1 +libmachuser=1 # libhurduser.so.0.3 corresponds to hurd/*.defs as of 11 June 2002. -.*-.*-gnu-gnu.* libhurduser=0.3 +libhurduser=0.3 # libc.so.0.3 is the first Hurd libc using libio. -.*-.*-gnu-gnu.* libc=0.3 +libc=0.3 diff --git a/sysdeps/unix/sysv/linux/aarch64/shlib-versions b/sysdeps/unix/sysv/linux/aarch64/shlib-versions index 67f19119aa..e1768a7361 100644 --- a/sysdeps/unix/sysv/linux/aarch64/shlib-versions +++ b/sysdeps/unix/sysv/linux/aarch64/shlib-versions @@ -1,7 +1,7 @@ -aarch64.*-.*-linux.* DEFAULT GLIBC_2.17 +DEFAULT GLIBC_2.17 %ifdef HAVE_AARCH64_BE -aarch64.*-.*-linux.* ld=ld-linux-aarch64_be.so.1 +ld=ld-linux-aarch64_be.so.1 %else -aarch64.*-.*-linux.* ld=ld-linux-aarch64.so.1 +ld=ld-linux-aarch64.so.1 %endif diff --git a/sysdeps/unix/sysv/linux/alpha/shlib-versions b/sysdeps/unix/sysv/linux/alpha/shlib-versions index cd4b9af78d..cd913c257c 100644 --- a/sysdeps/unix/sysv/linux/alpha/shlib-versions +++ b/sysdeps/unix/sysv/linux/alpha/shlib-versions @@ -1,14 +1,14 @@ -alpha.*-.*-linux.* libm=6.1 -alpha.*-.*-linux.* libc=6.1 +libm=6.1 +libc=6.1 -alpha.*-.*-linux.* ld=ld-linux.so.2 +ld=ld-linux.so.2 -alpha.*-.*-linux.* libdl=2.1 +libdl=2.1 -alpha.*-.*-linux.* libutil=1.1 +libutil=1.1 -alpha.*-.*-linux.* libresolv=2.1 +libresolv=2.1 -alpha.*-.*-linux.* libnsl=1.1 -alpha.*-.*-linux.* libcrypt=1.1 -alpha.*-.*-linux.* libBrokenLocale=1.1 +libnsl=1.1 +libcrypt=1.1 +libBrokenLocale=1.1 diff --git a/sysdeps/unix/sysv/linux/arm/shlib-versions b/sysdeps/unix/sysv/linux/arm/shlib-versions index 1ac597abbb..9b169530d4 100644 --- a/sysdeps/unix/sysv/linux/arm/shlib-versions +++ b/sysdeps/unix/sysv/linux/arm/shlib-versions @@ -1,9 +1,9 @@ -arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4 +DEFAULT GLIBC_2.4 %ifdef HAVE_ARM_PCS_VFP # The EABI-derived hard-float ABI uses a new dynamic linker. -arm.*-.*-linux-gnueabi.* ld=ld-linux-armhf.so.3 +ld=ld-linux-armhf.so.3 %else # The EABI-derived soft-float ABI continues to use ld-linux.so.3. -arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 +ld=ld-linux.so.3 %endif diff --git a/sysdeps/unix/sysv/linux/hppa/shlib-versions b/sysdeps/unix/sysv/linux/hppa/shlib-versions index ee46e4ab00..3a2d496220 100644 --- a/sysdeps/unix/sysv/linux/hppa/shlib-versions +++ b/sysdeps/unix/sysv/linux/hppa/shlib-versions @@ -1,9 +1,9 @@ -hppa.*-.*-.* libm=6 GLIBC_2.2 +libm=6 GLIBC_2.2 -hppa.*-.*-.* libc=6 GLIBC_2.2 +libc=6 GLIBC_2.2 -hppa.*-.*-.* ld=ld.so.1 GLIBC_2.2 +ld=ld.so.1 GLIBC_2.2 -hppa-.*-.* libBrokenLocale=1 GLIBC_2.2 +libBrokenLocale=1 GLIBC_2.2 -hppa.*-.*-linux.* libpthread=0 GLIBC_2.2 +libpthread=0 GLIBC_2.2 diff --git a/sysdeps/unix/sysv/linux/ia64/shlib-versions b/sysdeps/unix/sysv/linux/ia64/shlib-versions index c8e1482892..37374c0e20 100644 --- a/sysdeps/unix/sysv/linux/ia64/shlib-versions +++ b/sysdeps/unix/sysv/linux/ia64/shlib-versions @@ -1,8 +1,8 @@ -ia64-.*-linux.* libc=6.1 GLIBC_2.2 -ia64-.*-linux.* libm=6.1 GLIBC_2.2 +libc=6.1 GLIBC_2.2 +libm=6.1 GLIBC_2.2 -ia64-.*-linux.* ld=ld-linux-ia64.so.2 GLIBC_2.2 +ld=ld-linux-ia64.so.2 GLIBC_2.2 -ia64-.*-.* libBrokenLocale=1 GLIBC_2.2 +libBrokenLocale=1 GLIBC_2.2 -ia64.*-.*-linux.* libpthread=0 GLIBC_2.2 +libpthread=0 GLIBC_2.2 diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions b/sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions index f4c68b2a51..4309e4a368 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions @@ -1 +1 @@ -m68k-.*-linux.* DEFAULT GLIBC_2.4 +DEFAULT GLIBC_2.4 diff --git a/sysdeps/unix/sysv/linux/microblaze/shlib-versions b/sysdeps/unix/sysv/linux/microblaze/shlib-versions index 6ec43db15b..eaf37a118e 100644 --- a/sysdeps/unix/sysv/linux/microblaze/shlib-versions +++ b/sysdeps/unix/sysv/linux/microblaze/shlib-versions @@ -1 +1 @@ -microblaze.*-.*-linux.* DEFAULT GLIBC_2.18 +DEFAULT GLIBC_2.18 diff --git a/sysdeps/unix/sysv/linux/mips/shlib-versions b/sysdeps/unix/sysv/linux/mips/shlib-versions index d1414ede64..c5bd7db098 100644 --- a/sysdeps/unix/sysv/linux/mips/shlib-versions +++ b/sysdeps/unix/sysv/linux/mips/shlib-versions @@ -1,27 +1,27 @@ -mips.*-.*-linux.* libm=6 GLIBC_2.0 GLIBC_2.2 +libm=6 GLIBC_2.0 GLIBC_2.2 # Working mips versions were never released between 2.0 and 2.2. -mips.*-.*-linux.* libc=6 GLIBC_2.0 GLIBC_2.2 +libc=6 GLIBC_2.0 GLIBC_2.2 %ifdef HAVE_MIPS_NAN2008 -mips.*-.*-linux.* ld=ld-linux-mipsn8.so.1 GLIBC_2.0 GLIBC_2.2 +ld=ld-linux-mipsn8.so.1 GLIBC_2.0 GLIBC_2.2 %else -mips.*-.*-linux.* ld=ld.so.1 GLIBC_2.0 GLIBC_2.2 +ld=ld.so.1 GLIBC_2.0 GLIBC_2.2 %endif -mips.*-.*-linux.* libdl=2 GLIBC_2.0 GLIBC_2.2 +libdl=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libresolv=2 GLIBC_2.0 GLIBC_2.2 +libresolv=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libnss_files=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libnss_dns=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libnss_compat=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libnss_nis=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libnss_nisplus=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libnss_ldap=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libnss_hesiod=2 GLIBC_2.0 GLIBC_2.2 +libnss_files=2 GLIBC_2.0 GLIBC_2.2 +libnss_dns=2 GLIBC_2.0 GLIBC_2.2 +libnss_compat=2 GLIBC_2.0 GLIBC_2.2 +libnss_nis=2 GLIBC_2.0 GLIBC_2.2 +libnss_nisplus=2 GLIBC_2.0 GLIBC_2.2 +libnss_ldap=2 GLIBC_2.0 GLIBC_2.2 +libnss_hesiod=2 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libnsl=1 GLIBC_2.0 GLIBC_2.2 +libnsl=1 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* librt=1 GLIBC_2.0 GLIBC_2.2 +librt=1 GLIBC_2.0 GLIBC_2.2 -mips.*-.*-linux.* libpthread=0 GLIBC_2.0 GLIBC_2.2 +libpthread=0 GLIBC_2.0 GLIBC_2.2 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions index 1febda46d0..0b83af114e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions @@ -1,7 +1,7 @@ %ifdef HAVE_ELFV2_ABI -powerpc.*le-.*-linux.* DEFAULT GLIBC_2.17 -powerpc.*le-.*-linux.* libpthread=0 GLIBC_2.17 +DEFAULT GLIBC_2.17 +libpthread=0 GLIBC_2.17 %else -powerpc64-.*-linux.* DEFAULT GLIBC_2.3 -powerpc64-.*-linux.* libpthread=0 GLIBC_2.3 +DEFAULT GLIBC_2.3 +libpthread=0 GLIBC_2.3 %endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions b/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions index cab0c0b2fa..31edcfc4e1 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions +++ b/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions @@ -1,2 +1,2 @@ -s390x-.*-linux.* DEFAULT GLIBC_2.2 -s390x-.*-linux.* libpthread=0 GLIBC_2.2 +DEFAULT GLIBC_2.2 +libpthread=0 GLIBC_2.2 diff --git a/sysdeps/unix/sysv/linux/sh/shlib-versions b/sysdeps/unix/sysv/linux/sh/shlib-versions index c376fe8011..9333bbd7a3 100644 --- a/sysdeps/unix/sysv/linux/sh/shlib-versions +++ b/sysdeps/unix/sysv/linux/sh/shlib-versions @@ -1,5 +1,5 @@ -sh.*-.*-linux.* libm=6 GLIBC_2.2 -sh.*-.*-linux.* libc=6 GLIBC_2.2 -sh.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2 -sh.*-.*-.* libBrokenLocale=1 GLIBC_2.2 -sh.*-.*-linux.* libpthread=0 GLIBC_2.2 +libm=6 GLIBC_2.2 +libc=6 GLIBC_2.2 +ld=ld-linux.so.2 GLIBC_2.2 +libBrokenLocale=1 GLIBC_2.2 +libpthread=0 GLIBC_2.2 diff --git a/sysdeps/unix/sysv/linux/shlib-versions b/sysdeps/unix/sysv/linux/shlib-versions index 2c06a8e40c..9160557733 100644 --- a/sysdeps/unix/sysv/linux/shlib-versions +++ b/sysdeps/unix/sysv/linux/shlib-versions @@ -1,2 +1,2 @@ -.*-.*-linux.* libm=6 -.*-.*-linux.* libc=6 +libm=6 +libc=6 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions b/sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions index 26ca1f4858..ca5d15b1df 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions @@ -1 +1 @@ -sparc.*-.*-linux.* ld=ld-linux.so.2 +ld=ld-linux.so.2 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions b/sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions index 58d2c241ed..9333bbd7a3 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions @@ -1,5 +1,5 @@ -sparc64.*-.*-linux.* libm=6 GLIBC_2.2 -sparc64.*-.*-linux.* libc=6 GLIBC_2.2 -sparc64.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2 -sparc64.*-.*-.* libBrokenLocale=1 GLIBC_2.2 -sparc64.*-.*-linux.* libpthread=0 GLIBC_2.2 +libm=6 GLIBC_2.2 +libc=6 GLIBC_2.2 +ld=ld-linux.so.2 GLIBC_2.2 +libBrokenLocale=1 GLIBC_2.2 +libpthread=0 GLIBC_2.2 diff --git a/sysdeps/unix/sysv/linux/tile/shlib-versions b/sysdeps/unix/sysv/linux/tile/shlib-versions index f50868ff64..b4360d35e1 100644 --- a/sysdeps/unix/sysv/linux/tile/shlib-versions +++ b/sysdeps/unix/sysv/linux/tile/shlib-versions @@ -1,2 +1,2 @@ # glibc 2.12 was released to customers; 2.15 was the first community version. -tile.*-.*-linux-gnu DEFAULT GLIBC_2.12 GLIBC_2.15 +DEFAULT GLIBC_2.12 GLIBC_2.15 diff --git a/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions index 90ea1b79af..3d28722178 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions +++ b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions @@ -1,4 +1,4 @@ -# Configuration DEFAULT Earliest symbol set -# ------------- --------------- ------------------------------ -x86_64-.*-linux.* DEFAULT GLIBC_2.2.5 -x86_64-.*-linux.* libpthread=0 GLIBC_2.2.5 +# DEFAULT Earliest symbol set +# --------------- ------------------------------ +DEFAULT GLIBC_2.2.5 +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 8dd73e487d..e4db8b92ef 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions +++ b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions @@ -1,4 +1,4 @@ -# Configuration DEFAULT Earliest symbol set -# ------------- --------------- ------------------------------ -x86_64-.*-linux.* DEFAULT GLIBC_2.16 -x86_64-.*-linux.* libpthread=0 GLIBC_2.16 +# DEFAULT Earliest symbol set +# --------------- ------------------------------ +DEFAULT GLIBC_2.16 +libpthread=0 GLIBC_2.16 -- cgit 1.4.1