2003-01-03 04:32:33 +08:00
|
|
|
/* Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
1999-12-04 16:00:00 +08:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Andreas Jaeger <aj@suse.de>, 1999.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 12:58:11 +08:00
|
|
|
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.
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
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
|
2001-07-06 12:58:11 +08:00
|
|
|
Lesser General Public License for more details.
|
1999-12-04 16:00:00 +08:00
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
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. */
|
1999-12-04 16:00:00 +08:00
|
|
|
|
2000-09-27 22:58:54 +08:00
|
|
|
#include <alloca.h>
|
1999-12-04 16:00:00 +08:00
|
|
|
#include <argp.h>
|
|
|
|
#include <dirent.h>
|
2000-05-10 17:32:42 +08:00
|
|
|
#include <elf.h>
|
1999-12-04 16:00:00 +08:00
|
|
|
#include <error.h>
|
|
|
|
#include <errno.h>
|
2001-02-06 08:56:59 +08:00
|
|
|
#include <inttypes.h>
|
1999-12-04 16:00:00 +08:00
|
|
|
#include <libintl.h>
|
|
|
|
#include <stdio.h>
|
2001-07-18 05:56:59 +08:00
|
|
|
#include <stdio_ext.h>
|
1999-12-04 16:00:00 +08:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/fcntl.h>
|
|
|
|
#include <sys/mman.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#include "ldconfig.h"
|
2000-05-08 05:23:56 +08:00
|
|
|
#include "dl-cache.h"
|
1999-12-04 16:00:00 +08:00
|
|
|
|
2000-05-08 05:23:56 +08:00
|
|
|
#include "dl-procinfo.h"
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
#ifndef LD_SO_CONF
|
2000-07-13 05:10:41 +08:00
|
|
|
# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
|
1999-12-04 16:00:00 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Get libc version number. */
|
|
|
|
#include <version.h>
|
|
|
|
|
|
|
|
#define PACKAGE _libc_intl_domainname
|
|
|
|
|
|
|
|
static const struct
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
int flag;
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
} lib_types[] =
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
{"libc4", FLAG_LIBC4},
|
|
|
|
{"libc5", FLAG_ELF_LIBC5},
|
|
|
|
{"libc6", FLAG_ELF_LIBC6},
|
|
|
|
{"glibc2", FLAG_ELF_LIBC6}
|
2000-05-08 05:23:56 +08:00
|
|
|
};
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
|
|
|
|
/* List of directories to handle. */
|
|
|
|
struct dir_entry
|
|
|
|
{
|
|
|
|
char *path;
|
|
|
|
int flag;
|
2001-05-08 18:40:10 +08:00
|
|
|
ino64_t ino;
|
|
|
|
dev_t dev;
|
1999-12-04 16:00:00 +08:00
|
|
|
struct dir_entry *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* The list is unsorted, contains no duplicates. Entries are added at
|
|
|
|
the end. */
|
|
|
|
static struct dir_entry *dir_entries;
|
|
|
|
|
|
|
|
/* Flags for different options. */
|
|
|
|
/* Print Cache. */
|
2001-07-18 05:56:59 +08:00
|
|
|
static int opt_print_cache;
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
/* Be verbose. */
|
2001-07-18 05:56:59 +08:00
|
|
|
int opt_verbose;
|
1999-12-04 16:00:00 +08:00
|
|
|
|
2000-05-08 05:23:56 +08:00
|
|
|
/* Format to support. */
|
|
|
|
/* 0: only libc5/glibc2; 1: both; 2: only glibc 2.2. */
|
|
|
|
int opt_format = 1;
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Build cache. */
|
|
|
|
static int opt_build_cache = 1;
|
|
|
|
|
|
|
|
/* Generate links. */
|
|
|
|
static int opt_link = 1;
|
|
|
|
|
|
|
|
/* Only process directories specified on the command line. */
|
2001-07-18 05:56:59 +08:00
|
|
|
static int opt_only_cline;
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
/* Path to root for chroot. */
|
|
|
|
static char *opt_chroot;
|
|
|
|
|
1999-12-19 03:45:25 +08:00
|
|
|
/* Manually link given shared libraries. */
|
2001-07-18 05:56:59 +08:00
|
|
|
static int opt_manual_link;
|
1999-12-19 03:45:25 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Cache file to use. */
|
2000-09-30 08:54:42 +08:00
|
|
|
static char *cache_file;
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
/* Configuration file. */
|
|
|
|
static const char *config_file;
|
|
|
|
|
2001-07-18 03:47:50 +08:00
|
|
|
/* Mask to use for important hardware capabilities. */
|
|
|
|
static unsigned long int hwcap_mask = HWCAP_IMPORTANT;
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Name and version of program. */
|
|
|
|
static void print_version (FILE *stream, struct argp_state *state);
|
|
|
|
void (*argp_program_version_hook) (FILE *, struct argp_state *)
|
|
|
|
= print_version;
|
|
|
|
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
|
|
static const struct argp_option options[] =
|
|
|
|
{
|
|
|
|
{ "print-cache", 'p', NULL, 0, N_("Print cache"), 0},
|
|
|
|
{ "verbose", 'v', NULL, 0, N_("Generate verbose messages"), 0},
|
|
|
|
{ NULL, 'N', NULL, 0, N_("Don't build cache"), 0},
|
|
|
|
{ NULL, 'X', NULL, 0, N_("Don't generate links"), 0},
|
|
|
|
{ NULL, 'r', "ROOT", 0, N_("Change to and use ROOT as root directory"), 0},
|
|
|
|
{ NULL, 'C', "CACHE", 0, N_("Use CACHE as cache file"), 0},
|
|
|
|
{ NULL, 'f', "CONF", 0, N_("Use CONF as configuration file"), 0},
|
|
|
|
{ NULL, 'n', NULL, 0, N_("Only process directories specified on the command line. Don't build cache."), 0},
|
1999-12-19 03:45:25 +08:00
|
|
|
{ NULL, 'l', NULL, 0, N_("Manually link individual libraries."), 0},
|
2000-05-08 05:23:56 +08:00
|
|
|
{ "format", 'c', "FORMAT", 0, N_("Format to use: new, old or compat (default)"), 0},
|
1999-12-04 16:00:00 +08:00
|
|
|
{ NULL, 0, NULL, 0, NULL, 0 }
|
|
|
|
};
|
|
|
|
|
2003-07-23 06:28:07 +08:00
|
|
|
#define PROCINFO_CLASS static
|
|
|
|
#include <dl-procinfo.c>
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Short description of program. */
|
|
|
|
static const char doc[] = N_("Configure Dynamic Linker Run Time Bindings.");
|
|
|
|
|
|
|
|
/* Prototype for option handler. */
|
|
|
|
static error_t parse_opt (int key, char *arg, struct argp_state *state);
|
|
|
|
|
|
|
|
/* Data structure to communicate with argp functions. */
|
|
|
|
static struct argp argp =
|
|
|
|
{
|
|
|
|
options, parse_opt, NULL, doc, NULL, NULL, NULL
|
|
|
|
};
|
|
|
|
|
2000-11-15 16:46:30 +08:00
|
|
|
/* Check if string corresponds to an important hardware capability or
|
|
|
|
a platform. */
|
2000-05-08 05:23:56 +08:00
|
|
|
static int
|
2000-11-15 16:46:30 +08:00
|
|
|
is_hwcap_platform (const char *name)
|
2000-05-08 05:23:56 +08:00
|
|
|
{
|
|
|
|
int hwcap_idx = _dl_string_hwcap (name);
|
2000-07-13 05:10:41 +08:00
|
|
|
|
2001-07-18 03:47:50 +08:00
|
|
|
if (hwcap_idx != -1 && ((1 << hwcap_idx) & hwcap_mask))
|
2000-05-08 05:23:56 +08:00
|
|
|
return 1;
|
2000-11-15 16:46:30 +08:00
|
|
|
|
|
|
|
hwcap_idx = _dl_string_platform (name);
|
|
|
|
if (hwcap_idx != -1)
|
|
|
|
return 1;
|
|
|
|
|
2002-12-20 16:49:27 +08:00
|
|
|
#ifdef USE_TLS
|
|
|
|
if (strcmp (name, "tls") == 0)
|
|
|
|
return 1;
|
|
|
|
#endif
|
|
|
|
|
2000-05-08 05:23:56 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-11-15 16:46:30 +08:00
|
|
|
/* Get hwcap (including platform) encoding of path. */
|
|
|
|
static uint64_t
|
2000-05-08 05:23:56 +08:00
|
|
|
path_hwcap (const char *path)
|
|
|
|
{
|
|
|
|
char *str = xstrdup (path);
|
|
|
|
char *ptr;
|
2000-11-15 16:46:30 +08:00
|
|
|
uint64_t hwcap = 0;
|
|
|
|
uint64_t h;
|
2000-05-08 05:23:56 +08:00
|
|
|
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
len = strlen (str);
|
|
|
|
if (str[len] == '/')
|
|
|
|
str[len] = '\0';
|
|
|
|
|
|
|
|
/* Search pathname from the end and check for hwcap strings. */
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
ptr = strrchr (str, '/');
|
|
|
|
|
|
|
|
if (ptr == NULL)
|
|
|
|
break;
|
|
|
|
|
2000-11-15 16:46:30 +08:00
|
|
|
h = _dl_string_hwcap (ptr + 1);
|
2000-05-08 05:23:56 +08:00
|
|
|
|
2000-11-21 01:40:29 +08:00
|
|
|
if (h == (uint64_t) -1)
|
|
|
|
{
|
|
|
|
h = _dl_string_platform (ptr + 1);
|
|
|
|
if (h == (uint64_t) -1)
|
2002-12-20 16:49:27 +08:00
|
|
|
{
|
|
|
|
#ifdef USE_TLS
|
|
|
|
if (strcmp (ptr + 1, "tls") == 0)
|
|
|
|
h = 63;
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
}
|
2000-11-21 01:40:29 +08:00
|
|
|
}
|
2000-11-15 16:46:30 +08:00
|
|
|
hwcap += 1ULL << h;
|
1999-12-04 16:00:00 +08:00
|
|
|
|
2000-05-08 05:23:56 +08:00
|
|
|
/* Search the next part of the path. */
|
|
|
|
*ptr = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
free (str);
|
|
|
|
return hwcap;
|
|
|
|
}
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
/* Handle program arguments. */
|
|
|
|
static error_t
|
|
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
|
|
{
|
|
|
|
switch (key)
|
|
|
|
{
|
|
|
|
case 'C':
|
|
|
|
cache_file = arg;
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
config_file = arg;
|
|
|
|
break;
|
1999-12-19 03:45:25 +08:00
|
|
|
case 'l':
|
|
|
|
opt_manual_link = 1;
|
|
|
|
break;
|
1999-12-04 16:00:00 +08:00
|
|
|
case 'N':
|
|
|
|
opt_build_cache = 0;
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
opt_build_cache = 0;
|
|
|
|
opt_only_cline = 1;
|
|
|
|
break;
|
|
|
|
case 'p':
|
|
|
|
opt_print_cache = 1;
|
|
|
|
break;
|
|
|
|
case 'r':
|
|
|
|
opt_chroot = arg;
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
opt_verbose = 1;
|
|
|
|
break;
|
|
|
|
case 'X':
|
|
|
|
opt_link = 0;
|
|
|
|
break;
|
2000-05-08 05:23:56 +08:00
|
|
|
case 'c':
|
|
|
|
if (strcmp (arg, "old") == 0)
|
|
|
|
opt_format = 0;
|
|
|
|
else if (strcmp (arg, "compat") == 0)
|
|
|
|
opt_format = 1;
|
|
|
|
else if (strcmp (arg, "new") == 0)
|
|
|
|
opt_format = 2;
|
|
|
|
break;
|
1999-12-04 16:00:00 +08:00
|
|
|
default:
|
|
|
|
return ARGP_ERR_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print the version information. */
|
|
|
|
static void
|
|
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
|
|
{
|
|
|
|
fprintf (stream, "ldconfig (GNU %s) %s\n", PACKAGE, VERSION);
|
|
|
|
fprintf (stream, gettext ("\
|
|
|
|
Copyright (C) %s Free Software Foundation, Inc.\n\
|
|
|
|
This is free software; see the source for copying conditions. There is NO\n\
|
|
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
|
2003-01-03 04:32:33 +08:00
|
|
|
"), "2003");
|
1999-12-04 16:00:00 +08:00
|
|
|
fprintf (stream, gettext ("Written by %s.\n"),
|
|
|
|
"Andreas Jaeger");
|
|
|
|
}
|
|
|
|
|
2000-09-25 02:35:20 +08:00
|
|
|
/* Add a single directory entry. */
|
|
|
|
static void
|
|
|
|
add_single_dir (struct dir_entry *entry, int verbose)
|
|
|
|
{
|
|
|
|
struct dir_entry *ptr, *prev;
|
|
|
|
|
|
|
|
ptr = dir_entries;
|
|
|
|
prev = ptr;
|
|
|
|
while (ptr != NULL)
|
|
|
|
{
|
|
|
|
/* Check for duplicates. */
|
2001-05-08 18:40:10 +08:00
|
|
|
if (ptr->ino == entry->ino && ptr->dev == entry->dev)
|
2000-09-25 02:35:20 +08:00
|
|
|
{
|
|
|
|
if (opt_verbose && verbose)
|
|
|
|
error (0, 0, _("Path `%s' given more than once"), entry->path);
|
|
|
|
/* Use the newer information. */
|
|
|
|
ptr->flag = entry->flag;
|
2001-05-08 18:40:10 +08:00
|
|
|
free (entry->path);
|
2000-09-25 02:35:20 +08:00
|
|
|
free (entry);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
prev = ptr;
|
|
|
|
ptr = ptr->next;
|
|
|
|
}
|
|
|
|
/* Is this the first entry? */
|
|
|
|
if (ptr == NULL && dir_entries == NULL)
|
|
|
|
dir_entries = entry;
|
|
|
|
else if (ptr == NULL)
|
|
|
|
prev->next = entry;
|
|
|
|
}
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Add one directory to the list of directories to process. */
|
|
|
|
static void
|
|
|
|
add_dir (const char *line)
|
|
|
|
{
|
|
|
|
char *equal_sign;
|
2000-09-25 02:35:20 +08:00
|
|
|
struct dir_entry *entry;
|
1999-12-04 16:00:00 +08:00
|
|
|
unsigned int i;
|
2001-05-08 18:40:10 +08:00
|
|
|
struct stat64 stat_buf;
|
2000-05-08 05:23:56 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
entry = xmalloc (sizeof (struct dir_entry));
|
|
|
|
entry->next = NULL;
|
2000-05-08 05:23:56 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Search for an '=' sign. */
|
|
|
|
entry->path = xstrdup (line);
|
|
|
|
equal_sign = strchr (entry->path, '=');
|
|
|
|
if (equal_sign)
|
|
|
|
{
|
|
|
|
*equal_sign = '\0';
|
|
|
|
++equal_sign;
|
|
|
|
entry->flag = FLAG_ANY;
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
for (i = 0; i < sizeof (lib_types) / sizeof (lib_types[0]); ++i)
|
1999-12-04 16:00:00 +08:00
|
|
|
if (strcmp (equal_sign, lib_types[i].name) == 0)
|
|
|
|
{
|
|
|
|
entry->flag = lib_types[i].flag;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (entry->flag == FLAG_ANY)
|
|
|
|
error (0, 0, _("%s is not a known library type"), equal_sign);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
entry->flag = FLAG_ANY;
|
|
|
|
}
|
|
|
|
|
2003-04-08 12:20:29 +08:00
|
|
|
/* Canonify path: for now only remove leading and trailing
|
|
|
|
whitespace and the trailing slashes slashes. */
|
1999-12-04 16:00:00 +08:00
|
|
|
i = strlen (entry->path) - 1;
|
2003-04-08 12:20:29 +08:00
|
|
|
|
|
|
|
while (isspace (entry->path[i]) && i > 0)
|
|
|
|
entry->path[i--] = '\0';
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
while (entry->path[i] == '/' && i > 0)
|
2003-04-08 12:20:29 +08:00
|
|
|
entry->path[i--] = '\0';
|
2000-05-08 05:23:56 +08:00
|
|
|
|
2001-05-08 18:40:10 +08:00
|
|
|
if (stat64 (entry->path, &stat_buf))
|
|
|
|
{
|
2001-05-17 23:46:45 +08:00
|
|
|
if (opt_verbose)
|
|
|
|
error (0, errno, _("Can't stat %s"), entry->path);
|
2001-05-08 18:40:10 +08:00
|
|
|
free (entry->path);
|
|
|
|
free (entry);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
entry->ino = stat_buf.st_ino;
|
|
|
|
entry->dev = stat_buf.st_dev;
|
|
|
|
|
|
|
|
add_single_dir (entry, 1);
|
1999-12-04 16:00:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
static int
|
|
|
|
chroot_stat (const char *real_path, const char *path, struct stat64 *st)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
char *canon_path;
|
|
|
|
|
|
|
|
if (!opt_chroot)
|
|
|
|
return stat64 (real_path, st);
|
|
|
|
|
|
|
|
ret = lstat64 (real_path, st);
|
|
|
|
if (ret || !S_ISLNK (st->st_mode))
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
canon_path = chroot_canon (opt_chroot, path);
|
|
|
|
if (canon_path == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
ret = stat64 (canon_path, st);
|
|
|
|
free (canon_path);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Create a symbolic link from soname to libname in directory path. */
|
|
|
|
static void
|
2000-09-30 08:54:42 +08:00
|
|
|
create_links (const char *real_path, const char *path, const char *libname,
|
|
|
|
const char *soname)
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
2000-09-27 22:58:54 +08:00
|
|
|
char *full_libname, *full_soname;
|
2000-09-30 08:54:42 +08:00
|
|
|
char *real_full_libname, *real_full_soname;
|
|
|
|
struct stat64 stat_lib, stat_so, lstat_so;
|
1999-12-04 16:00:00 +08:00
|
|
|
int do_link = 1;
|
|
|
|
int do_remove = 1;
|
|
|
|
/* XXX: The logics in this function should be simplified. */
|
2000-05-08 05:23:56 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Get complete path. */
|
2000-09-27 22:58:54 +08:00
|
|
|
full_libname = alloca (strlen (path) + strlen (libname) + 2);
|
2000-11-10 22:06:06 +08:00
|
|
|
full_soname = alloca (strlen (path) + strlen (soname) + 2);
|
2000-09-27 22:58:54 +08:00
|
|
|
sprintf (full_libname, "%s/%s", path, libname);
|
|
|
|
sprintf (full_soname, "%s/%s", path, soname);
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
{
|
|
|
|
real_full_libname = alloca (strlen (real_path) + strlen (libname) + 2);
|
2000-11-10 22:06:06 +08:00
|
|
|
real_full_soname = alloca (strlen (real_path) + strlen (soname) + 2);
|
2000-09-30 08:54:42 +08:00
|
|
|
sprintf (real_full_libname, "%s/%s", real_path, libname);
|
|
|
|
sprintf (real_full_soname, "%s/%s", real_path, soname);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
real_full_libname = full_libname;
|
|
|
|
real_full_soname = full_soname;
|
|
|
|
}
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
/* Does soname already exist and point to the right library? */
|
2000-09-30 08:54:42 +08:00
|
|
|
if (chroot_stat (real_full_soname, full_soname, &stat_so) == 0)
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
2000-09-30 08:54:42 +08:00
|
|
|
if (chroot_stat (real_full_libname, full_libname, &stat_lib))
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
error (0, 0, _("Can't stat %s\n"), full_libname);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (stat_lib.st_dev == stat_so.st_dev
|
|
|
|
&& stat_lib.st_ino == stat_so.st_ino)
|
|
|
|
/* Link is already correct. */
|
|
|
|
do_link = 0;
|
2000-09-30 08:54:42 +08:00
|
|
|
else if (lstat64 (full_soname, &lstat_so) == 0
|
1999-12-04 16:00:00 +08:00
|
|
|
&& !S_ISLNK (lstat_so.st_mode))
|
|
|
|
{
|
|
|
|
error (0, 0, _("%s is not a symbolic link\n"), full_soname);
|
|
|
|
do_link = 0;
|
|
|
|
do_remove = 0;
|
|
|
|
}
|
|
|
|
}
|
2000-09-30 08:54:42 +08:00
|
|
|
else if (lstat64 (real_full_soname, &lstat_so) != 0
|
1999-12-04 16:00:00 +08:00
|
|
|
|| !S_ISLNK (lstat_so.st_mode))
|
|
|
|
/* Unless it is a stale symlink, there is no need to remove. */
|
|
|
|
do_remove = 0;
|
|
|
|
|
|
|
|
if (opt_verbose)
|
|
|
|
printf ("\t%s -> %s", soname, libname);
|
|
|
|
|
|
|
|
if (do_link && opt_link)
|
|
|
|
{
|
|
|
|
/* Remove old link. */
|
|
|
|
if (do_remove)
|
2000-09-30 08:54:42 +08:00
|
|
|
if (unlink (real_full_soname))
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
error (0, 0, _("Can't unlink %s"), full_soname);
|
|
|
|
do_link = 0;
|
|
|
|
}
|
|
|
|
/* Create symbolic link. */
|
2000-09-30 08:54:42 +08:00
|
|
|
if (do_link && symlink (libname, real_full_soname))
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
error (0, 0, _("Can't link %s to %s"), full_soname, libname);
|
|
|
|
do_link = 0;
|
|
|
|
}
|
|
|
|
if (opt_verbose)
|
|
|
|
{
|
|
|
|
if (do_link)
|
|
|
|
fputs (_(" (changed)\n"), stdout);
|
|
|
|
else
|
|
|
|
fputs (_(" (SKIPPED)\n"), stdout);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (opt_verbose)
|
|
|
|
fputs ("\n", stdout);
|
|
|
|
}
|
|
|
|
|
1999-12-19 03:45:25 +08:00
|
|
|
/* Manually link the given library. */
|
|
|
|
static void
|
|
|
|
manual_link (char *library)
|
|
|
|
{
|
|
|
|
char *path;
|
2000-09-30 08:54:42 +08:00
|
|
|
char *real_path;
|
|
|
|
char *real_library;
|
1999-12-19 03:45:25 +08:00
|
|
|
char *libname;
|
|
|
|
char *soname;
|
2000-09-30 08:54:42 +08:00
|
|
|
struct stat64 stat_buf;
|
1999-12-19 03:45:25 +08:00
|
|
|
int flag;
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
unsigned int osversion;
|
1999-12-19 03:45:25 +08:00
|
|
|
|
|
|
|
/* Prepare arguments for create_links call. Split library name in
|
|
|
|
directory and filename first. Since path is allocated, we've got
|
|
|
|
to be careful to free at the end. */
|
|
|
|
path = xstrdup (library);
|
|
|
|
libname = strrchr (path, '/');
|
|
|
|
|
|
|
|
if (libname)
|
|
|
|
{
|
|
|
|
/* Successfully split names. Check if path is just "/" to avoid
|
|
|
|
an empty path. */
|
|
|
|
if (libname == path)
|
|
|
|
{
|
|
|
|
libname = library + 1;
|
|
|
|
path = xrealloc (path, 2);
|
|
|
|
strcpy (path, "/");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*libname = '\0';
|
|
|
|
++libname;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* There's no path, construct one. */
|
|
|
|
libname = library;
|
|
|
|
path = xrealloc (path, 2);
|
|
|
|
strcpy (path, ".");
|
|
|
|
}
|
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
{
|
|
|
|
real_path = chroot_canon (opt_chroot, path);
|
|
|
|
if (real_path == NULL)
|
|
|
|
{
|
|
|
|
error (0, errno, _("Can't find %s"), path);
|
|
|
|
free (path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
real_library = alloca (strlen (real_path) + strlen (libname) + 2);
|
|
|
|
sprintf (real_library, "%s/%s", real_path, libname);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
real_path = path;
|
|
|
|
real_library = library;
|
|
|
|
}
|
|
|
|
|
1999-12-19 03:45:25 +08:00
|
|
|
/* Do some sanity checks first. */
|
2000-09-30 08:54:42 +08:00
|
|
|
if (lstat64 (real_library, &stat_buf))
|
1999-12-19 03:45:25 +08:00
|
|
|
{
|
|
|
|
error (0, errno, _("Can't lstat %s"), library);
|
|
|
|
free (path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* We don't want links here! */
|
|
|
|
else if (!S_ISREG (stat_buf.st_mode))
|
|
|
|
{
|
|
|
|
error (0, 0, _("Ignored file %s since it is not a regular file."),
|
|
|
|
library);
|
|
|
|
free (path);
|
|
|
|
return;
|
|
|
|
}
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
if (process_file (real_library, library, libname, &flag, &osversion,
|
|
|
|
&soname, 0))
|
1999-12-19 03:45:25 +08:00
|
|
|
{
|
|
|
|
error (0, 0, _("No link created since soname could not be found for %s"),
|
|
|
|
library);
|
|
|
|
free (path);
|
|
|
|
return;
|
|
|
|
}
|
2000-09-30 08:54:42 +08:00
|
|
|
create_links (real_path, path, libname, soname);
|
1999-12-19 03:45:25 +08:00
|
|
|
free (soname);
|
|
|
|
free (path);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Read a whole directory and search for libraries.
|
|
|
|
The purpose is two-fold:
|
|
|
|
- search for libraries which will be added to the cache
|
|
|
|
- create symbolic links to the soname for each library
|
|
|
|
|
|
|
|
This has to be done separatly for each directory.
|
2000-05-08 05:23:56 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
To keep track of which libraries to add to the cache and which
|
|
|
|
links to create, we save a list of all libraries.
|
|
|
|
|
|
|
|
The algorithm is basically:
|
|
|
|
for all libraries in the directory do
|
|
|
|
get soname of library
|
|
|
|
if soname is already in list
|
|
|
|
if new library is newer, replace entry
|
|
|
|
otherwise ignore this library
|
|
|
|
otherwise add library to list
|
2000-05-08 05:23:56 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
For example, if the two libraries libxy.so.1.1 and libxy.so.1.2
|
|
|
|
exist and both have the same soname, e.g. libxy.so, a symbolic link
|
|
|
|
is created from libxy.so.1.2 (the newer one) to libxy.so.
|
|
|
|
libxy.so.1.2 and libxy.so are added to the cache - but not
|
|
|
|
libxy.so.1.1. */
|
|
|
|
|
|
|
|
/* Information for one library. */
|
2000-05-08 05:23:56 +08:00
|
|
|
struct dlib_entry
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *soname;
|
|
|
|
int flag;
|
|
|
|
int is_link;
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
unsigned int osversion;
|
1999-12-04 16:00:00 +08:00
|
|
|
struct dlib_entry *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
search_dir (const struct dir_entry *entry)
|
|
|
|
{
|
|
|
|
DIR *dir;
|
2003-01-13 16:53:14 +08:00
|
|
|
struct dirent64 *direntry;
|
2000-09-30 08:54:42 +08:00
|
|
|
char *file_name, *dir_name, *real_file_name, *real_name;
|
|
|
|
int file_name_len, real_file_name_len, len;
|
1999-12-04 16:00:00 +08:00
|
|
|
char *soname;
|
|
|
|
struct dlib_entry *dlibs;
|
|
|
|
struct dlib_entry *dlib_ptr;
|
2001-05-08 18:40:10 +08:00
|
|
|
struct stat64 lstat_buf, stat_buf;
|
|
|
|
int is_link, is_dir;
|
2000-11-15 16:46:30 +08:00
|
|
|
uint64_t hwcap = path_hwcap (entry->path);
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
unsigned int osversion;
|
2000-05-08 05:23:56 +08:00
|
|
|
|
2000-09-27 22:58:54 +08:00
|
|
|
file_name_len = PATH_MAX;
|
|
|
|
file_name = alloca (file_name_len);
|
2000-09-29 14:19:13 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
dlibs = NULL;
|
|
|
|
|
|
|
|
if (opt_verbose)
|
2000-05-08 05:23:56 +08:00
|
|
|
{
|
|
|
|
if (hwcap != 0)
|
2001-02-06 08:56:59 +08:00
|
|
|
printf ("%s: (hwcap: 0x%" PRIx64 ")\n", entry->path, hwcap);
|
2000-05-08 05:23:56 +08:00
|
|
|
else
|
|
|
|
printf ("%s:\n", entry->path);
|
|
|
|
}
|
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
{
|
|
|
|
dir_name = chroot_canon (opt_chroot, entry->path);
|
|
|
|
real_file_name_len = PATH_MAX;
|
|
|
|
real_file_name = alloca (real_file_name_len);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
dir_name = entry->path;
|
|
|
|
real_file_name_len = 0;
|
|
|
|
real_file_name = file_name;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dir_name == NULL || (dir = opendir (dir_name)) == NULL)
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
if (opt_verbose)
|
|
|
|
error (0, errno, _("Can't open directory %s"), entry->path);
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot && dir_name)
|
|
|
|
free (dir_name);
|
1999-12-04 16:00:00 +08:00
|
|
|
return;
|
|
|
|
}
|
2000-05-08 05:23:56 +08:00
|
|
|
|
2003-01-13 16:53:14 +08:00
|
|
|
while ((direntry = readdir64 (dir)) != NULL)
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
int flag;
|
|
|
|
#ifdef _DIRENT_HAVE_D_TYPE
|
|
|
|
/* We only look at links and regular files. */
|
|
|
|
if (direntry->d_type != DT_UNKNOWN
|
|
|
|
&& direntry->d_type != DT_LNK
|
2000-05-08 05:23:56 +08:00
|
|
|
&& direntry->d_type != DT_REG
|
|
|
|
&& direntry->d_type != DT_DIR)
|
1999-12-04 16:00:00 +08:00
|
|
|
continue;
|
|
|
|
#endif /* _DIRENT_HAVE_D_TYPE */
|
2000-05-08 05:23:56 +08:00
|
|
|
/* Does this file look like a shared library or is it a hwcap
|
|
|
|
subdirectory? The dynamic linker is also considered as
|
|
|
|
shared library. */
|
|
|
|
if (((strncmp (direntry->d_name, "lib", 3) != 0
|
|
|
|
&& strncmp (direntry->d_name, "ld-", 3) != 0)
|
|
|
|
|| strstr (direntry->d_name, ".so") == NULL)
|
2001-07-21 01:51:33 +08:00
|
|
|
&& (
|
|
|
|
#ifdef _DIRENT_HAVE_D_TYPE
|
|
|
|
direntry->d_type == DT_REG ||
|
|
|
|
#endif
|
|
|
|
!is_hwcap_platform (direntry->d_name)))
|
1999-12-04 16:00:00 +08:00
|
|
|
continue;
|
2000-09-27 22:58:54 +08:00
|
|
|
len = strlen (entry->path) + strlen (direntry->d_name);
|
|
|
|
if (len > file_name_len)
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
2000-09-27 22:58:54 +08:00
|
|
|
file_name_len = len + 1;
|
|
|
|
file_name = alloca (file_name_len);
|
2000-09-30 08:54:42 +08:00
|
|
|
if (!opt_chroot)
|
|
|
|
real_file_name = file_name;
|
|
|
|
}
|
|
|
|
sprintf (file_name, "%s/%s", entry->path, direntry->d_name);
|
|
|
|
if (opt_chroot)
|
|
|
|
{
|
|
|
|
len = strlen (dir_name) + strlen (direntry->d_name);
|
|
|
|
if (len > real_file_name_len)
|
|
|
|
{
|
|
|
|
real_file_name_len = len + 1;
|
|
|
|
real_file_name = alloca (real_file_name_len);
|
|
|
|
}
|
|
|
|
sprintf (real_file_name, "%s/%s", dir_name, direntry->d_name);
|
1999-12-04 16:00:00 +08:00
|
|
|
}
|
2000-09-25 00:13:15 +08:00
|
|
|
#ifdef _DIRENT_HAVE_D_TYPE
|
|
|
|
if (direntry->d_type != DT_UNKNOWN)
|
2001-05-08 18:40:10 +08:00
|
|
|
lstat_buf.st_mode = DTTOIF (direntry->d_type);
|
2000-09-25 00:13:15 +08:00
|
|
|
else
|
|
|
|
#endif
|
2001-07-21 01:51:33 +08:00
|
|
|
if (__builtin_expect (lstat64 (real_file_name, &lstat_buf), 0))
|
2000-09-25 00:13:15 +08:00
|
|
|
{
|
2001-07-21 01:51:33 +08:00
|
|
|
error (0, errno, _("Cannot lstat %s"), file_name);
|
2000-09-25 00:13:15 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2001-05-08 18:40:10 +08:00
|
|
|
is_link = S_ISLNK (lstat_buf.st_mode);
|
|
|
|
if (is_link)
|
|
|
|
{
|
|
|
|
/* In case of symlink, we check if the symlink refers to
|
|
|
|
a directory. */
|
2001-07-21 01:51:33 +08:00
|
|
|
if (__builtin_expect (stat64 (real_file_name, &stat_buf), 0))
|
2001-05-08 18:40:10 +08:00
|
|
|
{
|
2001-05-17 23:46:45 +08:00
|
|
|
if (opt_verbose)
|
2001-07-21 01:51:33 +08:00
|
|
|
error (0, errno, _("Cannot stat %s"), file_name);
|
2001-08-24 07:36:47 +08:00
|
|
|
|
|
|
|
/* Remove stale symlinks. */
|
|
|
|
if (strstr (direntry->d_name, ".so."))
|
|
|
|
unlink (real_file_name);
|
2001-05-08 18:40:10 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
is_dir = S_ISDIR (stat_buf.st_mode);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
is_dir = S_ISDIR (lstat_buf.st_mode);
|
|
|
|
|
|
|
|
if (is_dir && is_hwcap_platform (direntry->d_name))
|
2000-05-08 05:23:56 +08:00
|
|
|
{
|
2000-09-25 02:35:20 +08:00
|
|
|
/* Handle subdirectory later. */
|
|
|
|
struct dir_entry *new_entry;
|
|
|
|
|
|
|
|
new_entry = xmalloc (sizeof (struct dir_entry));
|
2000-09-27 22:58:54 +08:00
|
|
|
new_entry->path = xstrdup (file_name);
|
2000-09-25 02:35:20 +08:00
|
|
|
new_entry->flag = entry->flag;
|
|
|
|
new_entry->next = NULL;
|
2001-05-08 18:40:10 +08:00
|
|
|
if (is_link)
|
|
|
|
{
|
|
|
|
new_entry->ino = stat_buf.st_ino;
|
|
|
|
new_entry->dev = stat_buf.st_dev;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2001-07-21 01:51:33 +08:00
|
|
|
#ifdef _DIRENT_HAVE_D_TYPE
|
|
|
|
/* We have filled in lstat only #ifndef
|
|
|
|
_DIRENT_HAVE_D_TYPE. Fill it in if needed. */
|
|
|
|
if (direntry->d_type != DT_UNKNOWN
|
|
|
|
&& __builtin_expect (lstat64 (real_file_name, &lstat_buf),
|
|
|
|
0))
|
|
|
|
{
|
|
|
|
error (0, errno, _("Cannot lstat %s"), file_name);
|
|
|
|
free (new_entry->path);
|
|
|
|
free (new_entry);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2001-05-08 18:40:10 +08:00
|
|
|
new_entry->ino = lstat_buf.st_ino;
|
|
|
|
new_entry->dev = lstat_buf.st_dev;
|
|
|
|
}
|
2000-09-25 02:35:20 +08:00
|
|
|
add_single_dir (new_entry, 0);
|
2000-05-08 05:23:56 +08:00
|
|
|
continue;
|
|
|
|
}
|
2001-06-14 22:43:23 +08:00
|
|
|
else if (!S_ISREG (lstat_buf.st_mode) && !is_link)
|
1999-12-04 16:00:00 +08:00
|
|
|
continue;
|
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot && is_link)
|
|
|
|
{
|
|
|
|
real_name = chroot_canon (opt_chroot, file_name);
|
|
|
|
if (real_name == NULL)
|
|
|
|
{
|
|
|
|
if (strstr (file_name, ".so") == NULL)
|
|
|
|
error (0, 0, _("Input file %s not found.\n"), file_name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
real_name = real_file_name;
|
1999-12-04 16:00:00 +08:00
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (process_file (real_name, file_name, direntry->d_name, &flag,
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
&osversion, &soname, is_link))
|
2000-09-30 08:54:42 +08:00
|
|
|
{
|
|
|
|
if (real_name != real_file_name)
|
|
|
|
free (real_name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2003-08-26 05:50:13 +08:00
|
|
|
|
|
|
|
/* A link may just point to itself. */
|
1999-12-04 16:00:00 +08:00
|
|
|
if (is_link)
|
|
|
|
{
|
2003-08-26 05:50:13 +08:00
|
|
|
/* If the path the link points to isn't its soname and it is not
|
|
|
|
.so symlink for ld(1) only, we treat it as a normal file. */
|
2003-08-26 16:08:21 +08:00
|
|
|
const char *real_base_name = basename (real_file_name);
|
2003-08-26 05:50:13 +08:00
|
|
|
|
|
|
|
if (strcmp (real_base_name, soname) != 0)
|
|
|
|
{
|
|
|
|
len = strlen (real_base_name);
|
|
|
|
if (len < strlen (".so")
|
|
|
|
|| strcmp (real_base_name + len - strlen (".so"), ".so") != 0
|
|
|
|
|| strncmp (real_base_name, soname, len) != 0)
|
|
|
|
is_link = 0;
|
|
|
|
}
|
|
|
|
}
|
2000-05-08 05:23:56 +08:00
|
|
|
|
2003-08-25 17:06:06 +08:00
|
|
|
if (real_name != real_file_name)
|
|
|
|
free (real_name);
|
|
|
|
|
2003-08-26 05:50:13 +08:00
|
|
|
if (is_link)
|
|
|
|
{
|
|
|
|
free (soname);
|
|
|
|
soname = xstrdup (direntry->d_name);
|
|
|
|
}
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
if (flag == FLAG_ELF
|
|
|
|
&& (entry->flag == FLAG_ELF_LIBC5
|
|
|
|
|| entry->flag == FLAG_ELF_LIBC6))
|
|
|
|
flag = entry->flag;
|
|
|
|
/* Some sanity checks to print warnings. */
|
|
|
|
if (opt_verbose)
|
|
|
|
{
|
|
|
|
if (flag == FLAG_ELF_LIBC5 && entry->flag != FLAG_ELF_LIBC5
|
|
|
|
&& entry->flag != FLAG_ANY)
|
2000-09-27 22:58:54 +08:00
|
|
|
error (0, 0, _("libc5 library %s in wrong directory"), file_name);
|
1999-12-04 16:00:00 +08:00
|
|
|
if (flag == FLAG_ELF_LIBC6 && entry->flag != FLAG_ELF_LIBC6
|
|
|
|
&& entry->flag != FLAG_ANY)
|
2000-09-27 22:58:54 +08:00
|
|
|
error (0, 0, _("libc6 library %s in wrong directory"), file_name);
|
1999-12-04 16:00:00 +08:00
|
|
|
if (flag == FLAG_LIBC4 && entry->flag != FLAG_LIBC4
|
|
|
|
&& entry->flag != FLAG_ANY)
|
2000-09-27 22:58:54 +08:00
|
|
|
error (0, 0, _("libc4 library %s in wrong directory"), file_name);
|
1999-12-04 16:00:00 +08:00
|
|
|
}
|
2000-05-08 05:23:56 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Add library to list. */
|
|
|
|
for (dlib_ptr = dlibs; dlib_ptr != NULL; dlib_ptr = dlib_ptr->next)
|
|
|
|
{
|
|
|
|
/* Is soname already in list? */
|
|
|
|
if (strcmp (dlib_ptr->soname, soname) == 0)
|
|
|
|
{
|
|
|
|
/* Prefer a file to a link, otherwise check which one
|
|
|
|
is newer. */
|
|
|
|
if ((!is_link && dlib_ptr->is_link)
|
|
|
|
|| (is_link == dlib_ptr->is_link
|
2000-05-08 05:23:56 +08:00
|
|
|
&& _dl_cache_libcmp (dlib_ptr->name, direntry->d_name) < 0))
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
/* It's newer - add it. */
|
|
|
|
/* Flag should be the same - sanity check. */
|
|
|
|
if (dlib_ptr->flag != flag)
|
|
|
|
{
|
|
|
|
if (dlib_ptr->flag == FLAG_ELF
|
|
|
|
&& (flag == FLAG_ELF_LIBC5 || flag == FLAG_ELF_LIBC6))
|
|
|
|
dlib_ptr->flag = flag;
|
|
|
|
else if ((dlib_ptr->flag == FLAG_ELF_LIBC5
|
|
|
|
|| dlib_ptr->flag == FLAG_ELF_LIBC6)
|
|
|
|
&& flag == FLAG_ELF)
|
|
|
|
dlib_ptr->flag = flag;
|
|
|
|
else
|
|
|
|
error (0, 0, _("libraries %s and %s in directory %s have same soname but different type."),
|
|
|
|
dlib_ptr->name, direntry->d_name, entry->path);
|
|
|
|
}
|
|
|
|
free (dlib_ptr->name);
|
2001-03-16 17:59:58 +08:00
|
|
|
dlib_ptr->osversion = osversion;
|
1999-12-04 16:00:00 +08:00
|
|
|
dlib_ptr->name = xstrdup (direntry->d_name);
|
|
|
|
dlib_ptr->is_link = is_link;
|
|
|
|
}
|
|
|
|
/* Don't add this library, abort loop. */
|
|
|
|
/* Also free soname, since it's dynamically allocated. */
|
|
|
|
free (soname);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Add the library if it's not already in. */
|
|
|
|
if (dlib_ptr == NULL)
|
|
|
|
{
|
|
|
|
dlib_ptr = (struct dlib_entry *)xmalloc (sizeof (struct dlib_entry));
|
|
|
|
dlib_ptr->name = xstrdup (direntry->d_name);
|
|
|
|
dlib_ptr->flag = flag;
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
dlib_ptr->osversion = osversion;
|
1999-12-04 16:00:00 +08:00
|
|
|
dlib_ptr->soname = soname;
|
|
|
|
dlib_ptr->is_link = is_link;
|
|
|
|
/* Add at head of list. */
|
|
|
|
dlib_ptr->next = dlibs;
|
|
|
|
dlibs = dlib_ptr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
closedir (dir);
|
|
|
|
|
|
|
|
/* Now dlibs contains a list of all libs - add those to the cache
|
|
|
|
and created all symbolic links. */
|
|
|
|
for (dlib_ptr = dlibs; dlib_ptr != NULL; dlib_ptr = dlib_ptr->next)
|
|
|
|
{
|
|
|
|
/* Don't create links to links. */
|
|
|
|
if (dlib_ptr->is_link == 0)
|
2000-09-30 08:54:42 +08:00
|
|
|
create_links (dir_name, entry->path, dlib_ptr->name,
|
|
|
|
dlib_ptr->soname);
|
1999-12-04 16:00:00 +08:00
|
|
|
if (opt_build_cache)
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
add_to_cache (entry->path, dlib_ptr->soname, dlib_ptr->flag,
|
|
|
|
dlib_ptr->osversion, hwcap);
|
1999-12-04 16:00:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Free all resources. */
|
2000-05-08 05:23:56 +08:00
|
|
|
while (dlibs)
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
dlib_ptr = dlibs;
|
|
|
|
free (dlib_ptr->soname);
|
|
|
|
free (dlib_ptr->name);
|
|
|
|
dlibs = dlibs->next;
|
|
|
|
free (dlib_ptr);
|
|
|
|
}
|
2000-09-30 08:54:42 +08:00
|
|
|
|
|
|
|
if (opt_chroot && dir_name)
|
|
|
|
free (dir_name);
|
1999-12-04 16:00:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Search through all libraries. */
|
|
|
|
static void
|
|
|
|
search_dirs (void)
|
|
|
|
{
|
|
|
|
struct dir_entry *entry;
|
|
|
|
|
|
|
|
for (entry = dir_entries; entry != NULL; entry = entry->next)
|
|
|
|
search_dir (entry);
|
|
|
|
|
|
|
|
/* Free all allocated memory. */
|
|
|
|
while (dir_entries)
|
|
|
|
{
|
|
|
|
entry = dir_entries;
|
|
|
|
dir_entries = dir_entries->next;
|
|
|
|
free (entry->path);
|
|
|
|
free (entry);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Parse configuration file. */
|
|
|
|
static void
|
|
|
|
parse_conf (const char *filename)
|
|
|
|
{
|
2000-09-30 08:54:42 +08:00
|
|
|
FILE *file = NULL;
|
1999-12-04 16:00:00 +08:00
|
|
|
char *line = NULL;
|
2000-09-30 08:54:42 +08:00
|
|
|
const char *canon;
|
1999-12-04 16:00:00 +08:00
|
|
|
size_t len = 0;
|
2000-05-08 05:23:56 +08:00
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
{
|
|
|
|
canon = chroot_canon (opt_chroot, filename);
|
|
|
|
if (canon)
|
|
|
|
file = fopen (canon, "r");
|
|
|
|
else
|
|
|
|
canon = filename;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
canon = filename;
|
|
|
|
file = fopen (filename, "r");
|
|
|
|
}
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
if (file == NULL)
|
|
|
|
{
|
2000-09-30 08:54:42 +08:00
|
|
|
error (0, errno, _("Can't open configuration file %s"), canon);
|
|
|
|
if (canon != filename)
|
|
|
|
free ((char *) canon);
|
1999-12-04 16:00:00 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-07-18 05:56:59 +08:00
|
|
|
/* No threads use this stream. */
|
|
|
|
__fsetlocking (file, FSETLOCKING_BYCALLER);
|
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (canon != filename)
|
|
|
|
free ((char *) canon);
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
do
|
|
|
|
{
|
|
|
|
ssize_t n = getline (&line, &len, file);
|
|
|
|
if (n < 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (line[n - 1] == '\n')
|
|
|
|
line[n - 1] = '\0';
|
|
|
|
|
|
|
|
/* Because the file format does not know any form of quoting we
|
|
|
|
can search forward for the next '#' character and if found
|
|
|
|
make it terminating the line. */
|
|
|
|
*strchrnul (line, '#') = '\0';
|
|
|
|
|
2003-04-08 12:20:29 +08:00
|
|
|
/* Remove leading whitespace. NUL is no whitespace character. */
|
|
|
|
char *cp = line;
|
|
|
|
while (isspace (*cp))
|
|
|
|
++cp;
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* If the line is blank it is ignored. */
|
2003-04-08 12:20:29 +08:00
|
|
|
if (cp[0] == '\0')
|
1999-12-04 16:00:00 +08:00
|
|
|
continue;
|
|
|
|
|
2003-04-08 12:20:29 +08:00
|
|
|
add_dir (cp);
|
|
|
|
}
|
|
|
|
while (!feof_unlocked (file));
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
/* Free buffer and close file. */
|
|
|
|
free (line);
|
|
|
|
fclose (file);
|
|
|
|
}
|
|
|
|
|
2001-07-18 03:47:50 +08:00
|
|
|
/* Honour LD_HWCAP_MASK. */
|
|
|
|
static void
|
|
|
|
set_hwcap (void)
|
|
|
|
{
|
|
|
|
char *mask = getenv ("LD_HWCAP_MASK");
|
|
|
|
|
|
|
|
if (mask)
|
|
|
|
hwcap_mask = strtoul (mask, NULL, 0);
|
|
|
|
}
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
|
|
|
|
int
|
|
|
|
main (int argc, char **argv)
|
|
|
|
{
|
|
|
|
int remaining;
|
2000-05-08 05:23:56 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Parse and process arguments. */
|
|
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
|
2003-07-23 06:28:07 +08:00
|
|
|
/* Remaining arguments are additional directories if opt_manual_link
|
1999-12-19 03:45:25 +08:00
|
|
|
is not set. */
|
|
|
|
if (remaining != argc && !opt_manual_link)
|
1999-12-04 16:00:00 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = remaining; i < argc; ++i)
|
2003-07-23 06:28:07 +08:00
|
|
|
if (opt_build_cache && argv[i][0] != '/')
|
|
|
|
error (EXIT_FAILURE, 0,
|
|
|
|
_("relative path `%s' used to build cache"),
|
|
|
|
argv[i]);
|
|
|
|
else
|
|
|
|
add_dir (argv[i]);
|
1999-12-04 16:00:00 +08:00
|
|
|
}
|
|
|
|
|
2001-07-18 03:47:50 +08:00
|
|
|
set_hwcap ();
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
{
|
2000-09-29 14:19:13 +08:00
|
|
|
/* Normalize the path a bit, we might need it for printing later. */
|
|
|
|
char *endp = strchr (opt_chroot, '\0');
|
2000-09-30 08:54:42 +08:00
|
|
|
while (endp > opt_chroot && endp[-1] == '/')
|
2000-09-29 14:19:13 +08:00
|
|
|
--endp;
|
|
|
|
*endp = '\0';
|
2000-09-30 08:54:42 +08:00
|
|
|
if (endp == opt_chroot)
|
|
|
|
opt_chroot = NULL;
|
2000-09-29 14:19:13 +08:00
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
{
|
|
|
|
/* It is faster to use chroot if we can. */
|
|
|
|
if (!chroot (opt_chroot))
|
|
|
|
{
|
|
|
|
if (chdir ("/"))
|
|
|
|
error (EXIT_FAILURE, errno, _("Can't chdir to /"));
|
|
|
|
opt_chroot = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cache_file == NULL)
|
|
|
|
{
|
|
|
|
cache_file = alloca (strlen (LD_SO_CACHE) + 1);
|
|
|
|
strcpy (cache_file, LD_SO_CACHE);
|
1999-12-04 16:00:00 +08:00
|
|
|
}
|
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (config_file == NULL)
|
|
|
|
config_file = LD_SO_CONF;
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
if (opt_print_cache)
|
|
|
|
{
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
{
|
|
|
|
char *p = chroot_canon (opt_chroot, cache_file);
|
|
|
|
if (p == NULL)
|
|
|
|
error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"),
|
|
|
|
cache_file);
|
|
|
|
cache_file = p;
|
|
|
|
}
|
1999-12-04 16:00:00 +08:00
|
|
|
print_cache (cache_file);
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
free (cache_file);
|
1999-12-04 16:00:00 +08:00
|
|
|
exit (0);
|
|
|
|
}
|
|
|
|
|
2000-09-30 08:54:42 +08:00
|
|
|
if (opt_chroot)
|
|
|
|
{
|
|
|
|
/* Canonicalize the directory name of cache_file, not cache_file,
|
|
|
|
because we'll rename a temporary cache file to it. */
|
|
|
|
char *p = strrchr (cache_file, '/');
|
|
|
|
char *canon = chroot_canon (opt_chroot,
|
|
|
|
p ? (*p = '\0', cache_file) : "/");
|
|
|
|
|
|
|
|
if (canon == NULL)
|
|
|
|
{
|
|
|
|
error (EXIT_FAILURE, errno,
|
|
|
|
_("Can't open cache file directory %s\n"),
|
|
|
|
p ? cache_file : "/");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p)
|
|
|
|
++p;
|
|
|
|
else
|
|
|
|
p = cache_file;
|
|
|
|
|
|
|
|
cache_file = alloca (strlen (canon) + strlen (p) + 2);
|
|
|
|
sprintf (cache_file, "%s/%s", canon, p);
|
|
|
|
free (canon);
|
|
|
|
}
|
|
|
|
|
1999-12-19 03:45:25 +08:00
|
|
|
if (opt_manual_link)
|
|
|
|
{
|
|
|
|
/* Link all given libraries manually. */
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = remaining; i < argc; ++i)
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 15:40:05 +08:00
|
|
|
manual_link (argv[i]);
|
1999-12-19 03:45:25 +08:00
|
|
|
|
|
|
|
exit (0);
|
|
|
|
}
|
2000-05-08 05:23:56 +08:00
|
|
|
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
if (opt_build_cache)
|
|
|
|
init_cache ();
|
|
|
|
|
|
|
|
if (!opt_only_cline)
|
|
|
|
{
|
2003-08-08 15:43:03 +08:00
|
|
|
parse_conf (config_file);
|
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
/* Always add the standard search paths. */
|
2003-06-25 16:19:44 +08:00
|
|
|
add_system_dir (SLIBDIR);
|
2000-07-13 05:10:41 +08:00
|
|
|
if (strcmp (SLIBDIR, LIBDIR))
|
2003-06-25 16:19:44 +08:00
|
|
|
add_system_dir (LIBDIR);
|
1999-12-04 16:00:00 +08:00
|
|
|
}
|
2000-05-08 05:23:56 +08:00
|
|
|
|
1999-12-04 16:00:00 +08:00
|
|
|
search_dirs ();
|
|
|
|
|
|
|
|
if (opt_build_cache)
|
|
|
|
save_cache (cache_file);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|