From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31471 invoked by alias); 19 Jun 2003 18:36:01 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 31455 invoked from network); 19 Jun 2003 18:36:01 -0000 Received: from unknown (HELO localhost.localdomain) (195.113.19.66) by sources.redhat.com with SMTP; 19 Jun 2003 18:36:01 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by localhost.localdomain (8.12.8/8.12.8) with ESMTP id h5JIZwqO023413; Thu, 19 Jun 2003 20:35:58 +0200 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id h5JIZv65023410; Thu, 19 Jun 2003 20:35:57 +0200 Date: Thu, 19 Jun 2003 18:36:00 -0000 From: Jakub Jelinek To: Ulrich Drepper , Roland McGrath Cc: Glibc hackers Subject: [PATCH] ldconfig implicit directories on bi-ABI arches Message-ID: <20030619183557.GT20507@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i X-SW-Source: 2003-06/txt/msg00039.txt.bz2 Hi! This patch makes ldconfig on x86_64, s390{,x}, sparc{,64} and ppc{,64} scan all of {,/usr}/lib{,64} by default (unless -n) and on mips* {,/usr}/lib{,32,64}. 2003-06-19 Jakub Jelinek * elf/ldconfig.c (main): Use add_system_dir instead of add_dir. * sysdeps/generic/dl-cache.h (add_system_dir): Define. * sysdeps/unix/sysv/linux/x86_64/dl-cache.h: Include sparc dl-cache.h. * sysdeps/unix/sysv/linux/s390/dl-cache.h: New file. * sysdeps/unix/sysv/linux/mips/dl-cache.h: New file. * sysdeps/unix/sysv/linux/powerpc/dl-cache.h: New file. * sysdeps/unix/sysv/linux/sparc/dl-cache.h: New file. --- libc/elf/ldconfig.c.jj 2003-04-14 07:11:22.000000000 -0400 +++ libc/elf/ldconfig.c 2003-06-18 16:39:34.000000000 -0400 @@ -1103,9 +1103,9 @@ main (int argc, char **argv) if (!opt_only_cline) { /* Always add the standard search paths. */ - add_dir (SLIBDIR); + add_system_dir (SLIBDIR); if (strcmp (SLIBDIR, LIBDIR)) - add_dir (LIBDIR); + add_system_dir (LIBDIR); parse_conf (config_file); } --- libc/sysdeps/generic/dl-cache.h.jj 2003-06-16 14:26:24.000000000 -0400 +++ libc/sysdeps/generic/dl-cache.h 2003-06-18 16:42:17.000000000 -0400 @@ -32,6 +32,10 @@ # define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" #endif +#ifndef add_system_dir +# define add_system_dir(dir) add_dir (dir) +#endif + #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another --- libc/sysdeps/unix/sysv/linux/s390/dl-cache.h.jj 2003-06-18 17:03:34.000000000 -0400 +++ libc/sysdeps/unix/sysv/linux/s390/dl-cache.h 2003-06-18 17:27:35.000000000 -0400 @@ -0,0 +1 @@ +#include --- libc/sysdeps/unix/sysv/linux/mips/dl-cache.h.jj 2003-06-18 17:03:34.000000000 -0400 +++ libc/sysdeps/unix/sysv/linux/mips/dl-cache.h 2003-06-18 17:05:41.000000000 -0400 @@ -0,0 +1,43 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#define add_system_dir(dir) \ + do \ + { \ + size_t len = strlen (dir); \ + char path[len + 3]; \ + memcpy (path, dir, len + 1); \ + if (len >= 6 \ + && (! memcmp (path + len - 6, "/lib64", 6) \ + || ! memcmp (path + len - 6, "/lib32", 6))) \ + { \ + len -= 2; \ + path[len] = '\0'; \ + } \ + add_dir (path); \ + if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \ + { \ + memcpy (path + len, "32", 3); \ + add_dir (path); \ + memcpy (path + len, "64", 3); \ + add_dir (path); \ + } \ + } while (0) + +#include_next --- libc/sysdeps/unix/sysv/linux/powerpc/dl-cache.h.jj 2003-06-18 17:03:34.000000000 -0400 +++ libc/sysdeps/unix/sysv/linux/powerpc/dl-cache.h 2003-06-18 17:27:35.000000000 -0400 @@ -0,0 +1 @@ +#include --- libc/sysdeps/unix/sysv/linux/sparc/dl-cache.h.jj 2003-06-18 17:03:34.000000000 -0400 +++ libc/sysdeps/unix/sysv/linux/sparc/dl-cache.h 2003-06-18 17:26:49.000000000 -0400 @@ -0,0 +1,39 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#define add_system_dir(dir) \ + do \ + { \ + size_t len = strlen (dir); \ + char path[len + 3]; \ + memcpy (path, dir, len + 1); \ + if (len >= 6 && ! memcmp (path + len - 6, "/lib64", 6)) \ + { \ + len -= 2; \ + path[len] = '\0'; \ + } \ + add_dir (path); \ + if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \ + { \ + memcpy (path + len, "64", 3); \ + add_dir (path); \ + } \ + } while (0) + +#include --- libc/sysdeps/unix/sysv/linux/x86_64/dl-cache.h.jj 2002-04-22 07:51:40.000000000 -0400 +++ libc/sysdeps/unix/sysv/linux/x86_64/dl-cache.h 2003-06-18 17:29:02.000000000 -0400 @@ -1,5 +1,5 @@ /* Support for reading /etc/ld.so.cache files written by Linux ldconfig. - Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,4 +22,4 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) -#include_next +#include Jakub