From patchwork Tue Sep 9 16:08:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 387390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B99D14011D for ; Wed, 10 Sep 2014 02:08:52 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=vG17+z8ms1TlEymiTm4mWTS/8+6Aw GA93MvUo7xW1hm0dmRUJT5Fhi/lG2odnN/mY7gEFH39Kx+tqaggiMuCpSbKWm1bJ BxpE+Dlb2Dt6HyFqbDVVNPPpwp8FH3kCdUgMwKLyjqe/ILJpF2HgUkgGdd6BYMv8 sPeCa4fNJXbl6s= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=z7+h68JFXYCK112yUkn9hmepIII=; b=nW2 195ftBz5fgckiHUTpAGK4+wPLZuNVJV7Ziu7EW8lxhD/NhJvv5MOIxvKT3Ik1+XR +gqVRl19tImCon81toQmPCkuwluLFl0Tv/AWyLT0CfyCCeJzSQgL5oW2AgYJywg0 g3C6J0crGAeqwMlYxUg7stis9FiaNpmQCmzPIi0M= Received: (qmail 17607 invoked by alias); 9 Sep 2014 16:08:46 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 17595 invoked by uid 89); 9 Sep 2014 16:08:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Tue, 9 Sep 2014 16:08:38 +0000 From: "Joseph S. Myers" To: Subject: Move OS-specific shlib-versions entries to sysdeps files Message-ID: MIME-Version: 1.0 This patch, relative to a tree with (pending review) applied, moves OS-specific entries in the top-level shlib-versions file to appropriate sysdeps directories. I left the entries in nptl/shlib-versions and nptl_db/shlib-versions unchanged; I think it can be for those doing non-Linux NPTL-using ports to figure out whether those entries should actually be OS-independent or should move to sysdeps. Given these two patches, I think the only further change needed before the first column of shlib-versions can be eliminated will be changing sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions (added by my previous patch) to use %ifdef to distinguish BE and LE configurations, instead of relying on the powerpc64-.*-linux.* and powerpc.*le-.*-linux.* patterns. Tested on x86_64 that the installed shared libraries are unchanged by this patch. 2014-09-09 Joseph Myers * shlib-versions: Remove OS-specific entries. Moved to files in sysdeps. * sysdeps/mach/hurd/shlib-versions: New file. * sysdeps/unix/sysv/linux/shlib-versions: Likewise. diff --git a/shlib-versions b/shlib-versions index 860fb94..d34dea8 100644 --- a/shlib-versions +++ b/shlib-versions @@ -1,4 +1,5 @@ -# This file defines the shared library version numbers we will install. +# This file (and shlib-versions files in sysdeps directories) defines +# the shared library version numbers we will install. # The following lines list filename patterns matching canonical configurations, # and the associated versions to use for various libraries. The entire @@ -17,31 +18,10 @@ # to apply on matching configurations when the matching entry for a particular # library has no third column. The defaults must precede the entries they # apply to. -# -# Configuration DEFAULT Earliest symbol set -# ------------- --------------- ------------------------------ - -.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6 # Configuration Library=version Earliest symbol set (optional) # ------------- --------------- ------------------------------ -# The interface to -lm depends mostly only on cpu, not on operating system. -.*-.*-linux.* libm=6 -.*-.*-gnu-gnu.* libm=6 - -# We provide libc.so.6 for Linux kernel versions 2.0 and later. -.*-.*-linux.* libc=6 - -# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release. -.*-.*-gnu-gnu.* libmachuser=1 - -# libhurduser.so.0.3 corresponds to hurd/*.defs as of 11 June 2002. -.*-.*-gnu-gnu.* libhurduser=0.3 - -# libc.so.0.3 is the first Hurd libc using libio. -.*-.*-gnu-gnu.* libc=0.3 - # We use the ELF ABI standard name for the default. .*-.*-.* ld=ld.so.1 diff --git a/sysdeps/mach/hurd/shlib-versions b/sysdeps/mach/hurd/shlib-versions new file mode 100644 index 0000000..f79c633 --- /dev/null +++ b/sysdeps/mach/hurd/shlib-versions @@ -0,0 +1,12 @@ +.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6 + +.*-.*-gnu-gnu.* libm=6 + +# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release. +.*-.*-gnu-gnu.* libmachuser=1 + +# libhurduser.so.0.3 corresponds to hurd/*.defs as of 11 June 2002. +.*-.*-gnu-gnu.* libhurduser=0.3 + +# libc.so.0.3 is the first Hurd libc using libio. +.*-.*-gnu-gnu.* libc=0.3 diff --git a/sysdeps/unix/sysv/linux/shlib-versions b/sysdeps/unix/sysv/linux/shlib-versions new file mode 100644 index 0000000..2c06a8e --- /dev/null +++ b/sysdeps/unix/sysv/linux/shlib-versions @@ -0,0 +1,2 @@ +.*-.*-linux.* libm=6 +.*-.*-linux.* libc=6