2001-02-06 06:48:26 +01:00
|
|
|
/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
|
1999-12-04 09:00:00 +01: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 06:58:11 +02: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 09:00:00 +01: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 06:58:11 +02:00
|
|
|
Lesser General Public License for more details.
|
1999-12-04 09:00:00 +01:00
|
|
|
|
2001-07-06 06:58:11 +02: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 09:00:00 +01:00
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <error.h>
|
|
|
|
#include <dirent.h>
|
2001-02-06 06:48:26 +01:00
|
|
|
#include <inttypes.h>
|
1999-12-04 09:00:00 +01:00
|
|
|
#include <libintl.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#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-07 23:23:56 +02:00
|
|
|
#include "dl-cache.h"
|
1999-12-04 09:00:00 +01:00
|
|
|
|
|
|
|
struct cache_entry
|
|
|
|
{
|
2000-05-07 23:23:56 +02:00
|
|
|
char *lib; /* Library name. */
|
|
|
|
char *path; /* Path to find library. */
|
|
|
|
int flags; /* Flags to indicate kind of library. */
|
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 08:40:05 +01:00
|
|
|
unsigned int osversion; /* Required OS version. */
|
2000-11-15 09:42:13 +01:00
|
|
|
uint64_t hwcap; /* Important hardware capabilities. */
|
2000-05-07 23:23:56 +02:00
|
|
|
int bits_hwcap; /* Number of bits set in hwcap. */
|
|
|
|
struct cache_entry *next; /* Next entry in list. */
|
1999-12-04 09:00:00 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/* List of all cache entries. */
|
|
|
|
static struct cache_entry *entries;
|
|
|
|
|
|
|
|
static const char *flag_descr[] =
|
|
|
|
{ "libc4", "ELF", "libc5", "libc6"};
|
|
|
|
|
|
|
|
/* Print a single entry. */
|
|
|
|
static void
|
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 08:40:05 +01:00
|
|
|
print_entry (const char *lib, int flag, unsigned int osversion,
|
|
|
|
uint64_t hwcap, const char *key)
|
1999-12-04 09:00:00 +01:00
|
|
|
{
|
|
|
|
printf ("\t%s (", lib);
|
2000-04-04 22:57:44 +02:00
|
|
|
switch (flag & FLAG_TYPE_MASK)
|
1999-12-04 09:00:00 +01:00
|
|
|
{
|
|
|
|
case FLAG_LIBC4:
|
|
|
|
case FLAG_ELF:
|
|
|
|
case FLAG_ELF_LIBC5:
|
|
|
|
case FLAG_ELF_LIBC6:
|
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 08:40:05 +01:00
|
|
|
fputs (flag_descr[flag & FLAG_TYPE_MASK], stdout);
|
1999-12-04 09:00:00 +01:00
|
|
|
break;
|
|
|
|
default:
|
2001-03-19 23:08:34 +01:00
|
|
|
fputs (_("unknown"), stdout);
|
1999-12-04 09:00:00 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (flag & FLAG_REQUIRED_MASK)
|
|
|
|
{
|
|
|
|
#ifdef __sparc__
|
|
|
|
case FLAG_SPARC_LIB64:
|
|
|
|
fputs (",64bit", stdout);
|
2000-09-30 00:53:14 +02:00
|
|
|
#endif
|
|
|
|
#if defined __ia64__ || defined __i386__
|
|
|
|
case FLAG_IA64_LIB64:
|
|
|
|
fputs (",IA-64", stdout);
|
2001-03-19 23:08:34 +01:00
|
|
|
#endif
|
|
|
|
#if defined __s390__ || defined __s390x__
|
|
|
|
case FLAG_S390_LIB64:
|
|
|
|
fputs(",64bit", stdout);
|
1999-12-04 09:00:00 +01:00
|
|
|
#endif
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
default:
|
2000-05-07 23:23:56 +02:00
|
|
|
printf (",%d", flag & FLAG_REQUIRED_MASK);
|
1999-12-04 09:00:00 +01:00
|
|
|
break;
|
|
|
|
}
|
2000-05-07 23:23:56 +02:00
|
|
|
if (hwcap != 0)
|
2001-02-06 06:48:26 +01:00
|
|
|
printf (", hwcap: 0x%" PRIx64, hwcap);
|
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 08:40:05 +01:00
|
|
|
if (osversion != 0)
|
|
|
|
{
|
|
|
|
static const char *const abi_tag_os[] =
|
|
|
|
{
|
|
|
|
[0] = "Linux",
|
|
|
|
[1] = "Hurd",
|
|
|
|
[2] = "Solaris",
|
2001-03-19 23:08:34 +01:00
|
|
|
[3] = N_("Unknown OS")
|
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 08:40:05 +01:00
|
|
|
};
|
|
|
|
unsigned int os = osversion >> 24;
|
|
|
|
|
2001-03-19 23:08:34 +01:00
|
|
|
printf (_(", OS ABI: %s %d.%d.%d"),
|
|
|
|
_(abi_tag_os[os > 3 ? 3 : os]),
|
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 08:40:05 +01:00
|
|
|
(osversion >> 16) & 0xff,
|
|
|
|
(osversion >> 8) & 0xff,
|
|
|
|
osversion & 0xff);
|
|
|
|
}
|
1999-12-04 09:00:00 +01:00
|
|
|
printf (") => %s\n", key);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
/* Print the whole cache file, if a file contains the new cache format
|
|
|
|
hidden in the old one, print the contents of the new format. */
|
1999-12-04 09:00:00 +01:00
|
|
|
void
|
|
|
|
print_cache (const char *cache_name)
|
|
|
|
{
|
|
|
|
size_t cache_size;
|
2000-09-30 02:54:42 +02:00
|
|
|
struct stat64 st;
|
1999-12-04 09:00:00 +01:00
|
|
|
int fd;
|
|
|
|
unsigned int i;
|
|
|
|
struct cache_file *cache;
|
2000-05-07 23:23:56 +02:00
|
|
|
struct cache_file_new *cache_new = NULL;
|
1999-12-04 09:00:00 +01:00
|
|
|
const char *cache_data;
|
2000-05-07 23:23:56 +02:00
|
|
|
int format = 0;
|
2000-04-10 18:22:52 +02:00
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
fd = open (cache_name, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"), cache_name);
|
|
|
|
|
2000-09-30 02:54:42 +02:00
|
|
|
if (fstat64 (fd, &st) < 0
|
1999-12-04 09:00:00 +01:00
|
|
|
/* No need to map the file if it is empty. */
|
|
|
|
|| st.st_size == 0)
|
|
|
|
{
|
|
|
|
close (fd);
|
|
|
|
return;
|
|
|
|
}
|
2000-04-10 18:22:52 +02:00
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
cache = mmap (0, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
|
|
|
|
if (cache == MAP_FAILED)
|
|
|
|
error (EXIT_FAILURE, errno, _("mmap of cache file failed.\n"));
|
|
|
|
cache_size = st.st_size;
|
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
if (cache_size < sizeof (struct cache_file))
|
|
|
|
error (EXIT_FAILURE, 0, _("File is not a cache file.\n"));
|
|
|
|
|
|
|
|
if (memcmp (cache->magic, CACHEMAGIC, sizeof CACHEMAGIC - 1))
|
|
|
|
{
|
|
|
|
/* This can only be the new format without the old one. */
|
|
|
|
cache_new = (struct cache_file_new *) cache;
|
|
|
|
|
|
|
|
if (memcmp (cache_new->magic, CACHEMAGIC_NEW, sizeof CACHEMAGIC_NEW - 1)
|
|
|
|
|| memcmp (cache_new->version, CACHE_VERSION,
|
|
|
|
sizeof CACHE_VERSION - 1))
|
|
|
|
error (EXIT_FAILURE, 0, _("File is not a cache file.\n"));
|
|
|
|
format = 1;
|
|
|
|
/* This is where the strings start. */
|
2000-05-17 13:04:21 +02:00
|
|
|
cache_data = (const char *) cache_new;
|
2000-05-07 23:23:56 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-05-17 13:04:21 +02:00
|
|
|
size_t offset = ALIGN_CACHE (sizeof (struct cache_file)
|
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 08:40:05 +01:00
|
|
|
+ (cache->nlibs
|
|
|
|
* sizeof (struct file_entry)));
|
2000-05-07 23:23:56 +02:00
|
|
|
/* This is where the strings start. */
|
|
|
|
cache_data = (const char *) &cache->libs[cache->nlibs];
|
|
|
|
|
|
|
|
/* Check for a new cache embedded in the old format. */
|
|
|
|
if (cache_size >
|
2000-05-17 13:04:21 +02:00
|
|
|
(offset + sizeof (struct cache_file_new)))
|
2000-05-07 23:23:56 +02:00
|
|
|
{
|
2000-05-17 13:04:21 +02:00
|
|
|
|
|
|
|
cache_new = (struct cache_file_new *) ((void *)cache + offset);
|
1999-12-04 09:00:00 +01:00
|
|
|
|
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 08:40:05 +01:00
|
|
|
if (memcmp (cache_new->magic, CACHEMAGIC_NEW,
|
|
|
|
sizeof CACHEMAGIC_NEW - 1) == 0
|
|
|
|
&& memcmp (cache_new->version, CACHE_VERSION,
|
|
|
|
sizeof CACHE_VERSION - 1) == 0)
|
2000-05-17 13:04:21 +02:00
|
|
|
{
|
|
|
|
cache_data = (const char *) cache_new;
|
|
|
|
format = 1;
|
|
|
|
}
|
2000-05-07 23:23:56 +02:00
|
|
|
}
|
|
|
|
}
|
2000-04-10 18:22:52 +02:00
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
if (format == 0)
|
|
|
|
{
|
|
|
|
printf (_("%d libs found in cache `%s'\n"), cache->nlibs, cache_name);
|
1999-12-04 09:00:00 +01:00
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
/* Print everything. */
|
|
|
|
for (i = 0; i < cache->nlibs; i++)
|
|
|
|
print_entry (cache_data + cache->libs[i].key,
|
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 08:40:05 +01:00
|
|
|
cache->libs[i].flags, 0, 0,
|
2000-05-07 23:23:56 +02:00
|
|
|
cache_data + cache->libs[i].value);
|
|
|
|
}
|
|
|
|
else if (format == 1)
|
|
|
|
{
|
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 08:40:05 +01:00
|
|
|
printf (_("%d libs found in cache `%s'\n"),
|
|
|
|
cache_new->nlibs, cache_name);
|
2000-05-07 23:23:56 +02:00
|
|
|
|
|
|
|
/* Print everything. */
|
|
|
|
for (i = 0; i < cache_new->nlibs; i++)
|
|
|
|
print_entry (cache_data + cache_new->libs[i].key,
|
|
|
|
cache_new->libs[i].flags,
|
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 08:40:05 +01:00
|
|
|
cache_new->libs[i].osversion,
|
2000-05-07 23:23:56 +02:00
|
|
|
cache_new->libs[i].hwcap,
|
|
|
|
cache_data + cache_new->libs[i].value);
|
|
|
|
}
|
1999-12-04 09:00:00 +01:00
|
|
|
/* Cleanup. */
|
|
|
|
munmap (cache, cache_size);
|
|
|
|
close (fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize cache data structures. */
|
|
|
|
void
|
|
|
|
init_cache (void)
|
|
|
|
{
|
|
|
|
entries = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
int compare (const struct cache_entry *e1, const struct cache_entry *e2)
|
|
|
|
{
|
|
|
|
int res;
|
2000-04-10 18:22:52 +02:00
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
/* We need to swap entries here to get the correct sort order. */
|
2000-05-07 23:23:56 +02:00
|
|
|
res = _dl_cache_libcmp (e2->lib, e1->lib);
|
1999-12-04 09:00:00 +01:00
|
|
|
if (res == 0)
|
|
|
|
{
|
|
|
|
if (e1->flags < e2->flags)
|
|
|
|
return 1;
|
|
|
|
else if (e1->flags > e2->flags)
|
|
|
|
return -1;
|
2000-05-07 23:23:56 +02:00
|
|
|
/* Sort by most specific hwcap. */
|
|
|
|
else if (e2->bits_hwcap > e1->bits_hwcap)
|
|
|
|
return 1;
|
|
|
|
else if (e2->bits_hwcap < e1->bits_hwcap)
|
|
|
|
return -1;
|
|
|
|
else if (e2->hwcap > e1->hwcap)
|
|
|
|
return 1;
|
|
|
|
else if (e2->hwcap < e1->hwcap)
|
|
|
|
return -1;
|
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 08:40:05 +01:00
|
|
|
if (e2->osversion > e1->osversion)
|
|
|
|
return 1;
|
|
|
|
if (e2->osversion < e1->osversion)
|
|
|
|
return -1;
|
1999-12-04 09:00:00 +01:00
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save the contents of the cache. */
|
|
|
|
void
|
|
|
|
save_cache (const char *cache_name)
|
|
|
|
{
|
|
|
|
struct cache_entry *entry;
|
2000-05-07 23:23:56 +02:00
|
|
|
int fd, idx_old, idx_new;
|
1999-12-04 09:00:00 +01:00
|
|
|
size_t total_strlen, len;
|
|
|
|
char *strings, *str, *temp_name;
|
2000-05-07 23:23:56 +02:00
|
|
|
struct cache_file *file_entries = NULL;
|
|
|
|
struct cache_file_new *file_entries_new = NULL;
|
|
|
|
size_t file_entries_size = 0;
|
|
|
|
size_t file_entries_new_size = 0;
|
1999-12-04 09:00:00 +01:00
|
|
|
unsigned int str_offset;
|
|
|
|
/* Number of cache entries. */
|
|
|
|
int cache_entry_count = 0;
|
2000-05-07 23:23:56 +02:00
|
|
|
/* Number of normal cache entries. */
|
|
|
|
int cache_entry_old_count = 0;
|
2000-05-17 13:04:21 +02:00
|
|
|
/* Pad for alignment of cache_file_new. */
|
|
|
|
size_t pad;
|
1999-12-04 09:00:00 +01:00
|
|
|
|
|
|
|
/* The cache entries are sorted already, save them in this order. */
|
|
|
|
|
|
|
|
/* Count the length of all strings. */
|
2000-05-07 23:23:56 +02:00
|
|
|
/* The old format doesn't contain hwcap entries and doesn't contain
|
|
|
|
libraries in subdirectories with hwcaps entries. Count therefore
|
|
|
|
also all entries with hwcap == 0. */
|
1999-12-04 09:00:00 +01:00
|
|
|
total_strlen = 0;
|
|
|
|
for (entry = entries; entry != NULL; entry = entry->next)
|
|
|
|
{
|
|
|
|
/* Account the final NULs. */
|
|
|
|
total_strlen += strlen (entry->lib) + strlen (entry->path) + 2;
|
|
|
|
++cache_entry_count;
|
2000-05-07 23:23:56 +02:00
|
|
|
if (entry->hwcap == 0)
|
|
|
|
++cache_entry_old_count;
|
1999-12-04 09:00:00 +01:00
|
|
|
}
|
2000-04-10 18:22:52 +02:00
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
/* Create the on disk cache structure. */
|
|
|
|
/* First an array for all strings. */
|
2000-05-07 23:23:56 +02:00
|
|
|
strings = (char *)xmalloc (total_strlen);
|
1999-12-04 09:00:00 +01:00
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
if (opt_format != 2)
|
|
|
|
{
|
|
|
|
/* And the list of all entries in the old format. */
|
|
|
|
file_entries_size = sizeof (struct cache_file)
|
|
|
|
+ cache_entry_old_count * sizeof (struct file_entry);
|
|
|
|
file_entries = (struct cache_file *) xmalloc (file_entries_size);
|
|
|
|
|
|
|
|
/* Fill in the header. */
|
|
|
|
memset (file_entries, 0, sizeof (struct cache_file));
|
|
|
|
memcpy (file_entries->magic, CACHEMAGIC, sizeof CACHEMAGIC - 1);
|
1999-12-04 09:00:00 +01:00
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
file_entries->nlibs = cache_entry_old_count;
|
|
|
|
}
|
2000-04-10 18:22:52 +02:00
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
if (opt_format != 0)
|
|
|
|
{
|
|
|
|
/* And the list of all entries in the new format. */
|
|
|
|
file_entries_new_size = sizeof (struct cache_file_new)
|
|
|
|
+ cache_entry_count * sizeof (struct file_entry_new);
|
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 08:40:05 +01:00
|
|
|
file_entries_new =
|
|
|
|
(struct cache_file_new *) xmalloc (file_entries_new_size);
|
2000-05-07 23:23:56 +02:00
|
|
|
|
|
|
|
/* Fill in the header. */
|
|
|
|
memset (file_entries_new, 0, sizeof (struct cache_file_new));
|
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 08:40:05 +01:00
|
|
|
memcpy (file_entries_new->magic, CACHEMAGIC_NEW,
|
|
|
|
sizeof CACHEMAGIC_NEW - 1);
|
|
|
|
memcpy (file_entries_new->version, CACHE_VERSION,
|
|
|
|
sizeof CACHE_VERSION - 1);
|
2000-05-07 23:23:56 +02:00
|
|
|
|
|
|
|
file_entries_new->nlibs = cache_entry_count;
|
|
|
|
file_entries_new->len_strings = total_strlen;
|
|
|
|
}
|
2000-09-30 00:53:14 +02:00
|
|
|
|
2000-05-17 13:04:21 +02:00
|
|
|
pad = ALIGN_CACHE (file_entries_size) - file_entries_size;
|
2000-09-30 00:53:14 +02:00
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
/* If we have both formats, we hide the new format in the strings
|
|
|
|
table, we have to adjust all string indices for this so that
|
|
|
|
old libc5/glibc 2 dynamic linkers just ignore them. */
|
2000-05-17 13:04:21 +02:00
|
|
|
if (opt_format != 0)
|
2000-05-07 23:23:56 +02:00
|
|
|
str_offset = file_entries_new_size;
|
|
|
|
else
|
|
|
|
str_offset = 0;
|
1999-12-04 09:00:00 +01:00
|
|
|
|
|
|
|
str = strings;
|
2000-05-07 23:23:56 +02:00
|
|
|
for (idx_old = 0, idx_new = 0, entry = entries; entry != NULL;
|
|
|
|
entry = entry->next, ++idx_new)
|
1999-12-04 09:00:00 +01:00
|
|
|
{
|
|
|
|
/* First the library. */
|
2000-05-07 23:23:56 +02:00
|
|
|
if (opt_format != 2)
|
|
|
|
{
|
|
|
|
file_entries->libs[idx_old].flags = entry->flags;
|
|
|
|
/* XXX: Actually we can optimize here and remove duplicates. */
|
2000-05-17 13:04:21 +02:00
|
|
|
file_entries->libs[idx_old].key = str_offset + pad;
|
2000-05-07 23:23:56 +02:00
|
|
|
}
|
|
|
|
if (opt_format != 0)
|
|
|
|
{
|
|
|
|
/* We could subtract file_entries_new_size from str_offset -
|
|
|
|
not doing so makes the code easier, the string table
|
|
|
|
always begins at the beginning of the the new cache
|
|
|
|
struct. */
|
|
|
|
file_entries_new->libs[idx_new].flags = entry->flags;
|
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 08:40:05 +01:00
|
|
|
file_entries_new->libs[idx_new].osversion = entry->osversion;
|
2000-05-07 23:23:56 +02:00
|
|
|
file_entries_new->libs[idx_new].hwcap = entry->hwcap;
|
|
|
|
file_entries_new->libs[idx_new].key = str_offset;
|
|
|
|
}
|
1999-12-04 09:00:00 +01:00
|
|
|
len = strlen (entry->lib);
|
|
|
|
str = stpcpy (str, entry->lib);
|
|
|
|
/* Account the final NUL. */
|
|
|
|
++str;
|
|
|
|
str_offset += len + 1;
|
|
|
|
/* Then the path. */
|
2000-05-07 23:23:56 +02:00
|
|
|
if (opt_format != 2)
|
2000-05-17 13:04:21 +02:00
|
|
|
file_entries->libs[idx_old].value = str_offset + pad;
|
2000-05-07 23:23:56 +02:00
|
|
|
if (opt_format != 0)
|
|
|
|
file_entries_new->libs[idx_new].value = str_offset;
|
1999-12-04 09:00:00 +01:00
|
|
|
len = strlen (entry->path);
|
|
|
|
str = stpcpy (str, entry->path);
|
|
|
|
/* Account the final NUL. */
|
|
|
|
++str;
|
|
|
|
str_offset += len + 1;
|
2000-05-07 23:23:56 +02:00
|
|
|
/* Ignore entries with hwcap for old format. */
|
|
|
|
if (entry->hwcap == 0)
|
|
|
|
++idx_old;
|
1999-12-04 09:00:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Write out the cache. */
|
|
|
|
|
|
|
|
/* Write cache first to a temporary file and rename it later. */
|
|
|
|
temp_name = xmalloc (strlen (cache_name) + 2);
|
|
|
|
sprintf (temp_name, "%s~", cache_name);
|
|
|
|
/* First remove an old copy if it exists. */
|
|
|
|
if (unlink (temp_name) && errno != ENOENT)
|
|
|
|
error (EXIT_FAILURE, errno, _("Can't remove old temporary cache file %s"),
|
|
|
|
temp_name);
|
|
|
|
|
|
|
|
/* Create file. */
|
2001-02-27 18:59:27 +01:00
|
|
|
fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW,
|
|
|
|
S_IROTH|S_IRGRP|S_IRUSR|S_IWUSR);
|
1999-12-04 09:00:00 +01:00
|
|
|
if (fd < 0)
|
|
|
|
error (EXIT_FAILURE, errno, _("Can't create temporary cache file %s"),
|
|
|
|
temp_name);
|
|
|
|
|
|
|
|
/* Write contents. */
|
2000-05-07 23:23:56 +02:00
|
|
|
if (opt_format != 2)
|
|
|
|
{
|
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 08:40:05 +01:00
|
|
|
if (write (fd, file_entries, file_entries_size)
|
|
|
|
!= (ssize_t)file_entries_size)
|
2000-05-07 23:23:56 +02:00
|
|
|
error (EXIT_FAILURE, errno, _("Writing of cache data failed"));
|
|
|
|
}
|
|
|
|
if (opt_format != 0)
|
|
|
|
{
|
2000-05-17 13:04:21 +02:00
|
|
|
/* Align cache. */
|
|
|
|
if (opt_format != 2)
|
|
|
|
{
|
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 08:40:05 +01:00
|
|
|
char zero[pad];
|
2000-05-17 13:04:21 +02:00
|
|
|
if (write (fd, zero, pad) != (ssize_t)pad)
|
|
|
|
error (EXIT_FAILURE, errno, _("Writing of cache data failed"));
|
|
|
|
}
|
2000-05-07 23:23:56 +02:00
|
|
|
if (write (fd, file_entries_new, file_entries_new_size)
|
|
|
|
!= (ssize_t)file_entries_new_size)
|
|
|
|
error (EXIT_FAILURE, errno, _("Writing of cache data failed"));
|
|
|
|
}
|
1999-12-04 09:00:00 +01:00
|
|
|
|
|
|
|
if (write (fd, strings, total_strlen) != (ssize_t)total_strlen)
|
|
|
|
error (EXIT_FAILURE, errno, _("Writing of cache data failed."));
|
|
|
|
|
|
|
|
close (fd);
|
|
|
|
|
2000-04-10 18:22:52 +02:00
|
|
|
/* Make sure user can always read cache file */
|
2001-02-27 18:59:27 +01:00
|
|
|
if (chmod (temp_name, S_IROTH|S_IRGRP|S_IRUSR|S_IWUSR))
|
2000-04-10 18:22:52 +02:00
|
|
|
error (EXIT_FAILURE, errno,
|
2001-02-27 18:59:27 +01:00
|
|
|
_("Changing access rights of %s to %#o failed"), temp_name,
|
|
|
|
S_IROTH|S_IRGRP|S_IRUSR|S_IWUSR);
|
2000-04-10 18:22:52 +02:00
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
/* Move temporary to its final location. */
|
|
|
|
if (rename (temp_name, cache_name))
|
|
|
|
error (EXIT_FAILURE, errno, _("Renaming of %s to %s failed"), temp_name,
|
|
|
|
cache_name);
|
2000-04-10 18:22:52 +02:00
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
/* Free all allocated memory. */
|
|
|
|
free (file_entries);
|
|
|
|
free (strings);
|
|
|
|
|
|
|
|
while (entries)
|
|
|
|
{
|
|
|
|
entry = entries;
|
|
|
|
free (entry->path);
|
|
|
|
free (entry->lib);
|
|
|
|
entries = entries->next;
|
|
|
|
free (entry);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-05-07 23:23:56 +02:00
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
/* Add one library to the cache. */
|
|
|
|
void
|
2000-05-07 23:23:56 +02:00
|
|
|
add_to_cache (const char *path, const char *lib, int flags,
|
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 08:40:05 +01:00
|
|
|
unsigned int osversion, uint64_t hwcap)
|
1999-12-04 09:00:00 +01:00
|
|
|
{
|
|
|
|
struct cache_entry *new_entry, *ptr, *prev;
|
|
|
|
char *full_path;
|
2000-05-07 23:23:56 +02:00
|
|
|
int len, i;
|
1999-12-04 09:00:00 +01:00
|
|
|
|
|
|
|
new_entry = (struct cache_entry *) xmalloc (sizeof (struct cache_entry));
|
|
|
|
|
|
|
|
len = strlen (lib) + strlen (path) + 2;
|
|
|
|
|
|
|
|
full_path = (char *) xmalloc (len);
|
|
|
|
snprintf (full_path, len, "%s/%s", path, lib);
|
2000-04-10 18:22:52 +02:00
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
new_entry->lib = xstrdup (lib);
|
|
|
|
new_entry->path = full_path;
|
|
|
|
new_entry->flags = flags;
|
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 08:40:05 +01:00
|
|
|
new_entry->osversion = osversion;
|
2000-05-07 23:23:56 +02:00
|
|
|
new_entry->hwcap = hwcap;
|
|
|
|
new_entry->bits_hwcap = 0;
|
|
|
|
|
|
|
|
/* Count the number of bits set in the masked value. */
|
2000-11-15 09:42:13 +01:00
|
|
|
for (i = 0; (~((1ULL << i) - 1) & hwcap) != 0; ++i)
|
|
|
|
if ((hwcap & (1ULL << i)) != 0)
|
2000-05-07 23:23:56 +02:00
|
|
|
++new_entry->bits_hwcap;
|
|
|
|
|
1999-12-04 09:00:00 +01:00
|
|
|
|
|
|
|
/* Keep the list sorted - search for right place to insert. */
|
|
|
|
ptr = entries;
|
|
|
|
prev = entries;
|
|
|
|
while (ptr != NULL)
|
|
|
|
{
|
|
|
|
if (compare (ptr, new_entry) > 0)
|
|
|
|
break;
|
|
|
|
prev = ptr;
|
|
|
|
ptr = ptr->next;
|
|
|
|
}
|
|
|
|
/* Is this the first entry? */
|
|
|
|
if (ptr == entries)
|
|
|
|
{
|
|
|
|
new_entry->next = entries;
|
|
|
|
entries = new_entry;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
new_entry->next = prev->next;
|
|
|
|
prev->next = new_entry;
|
|
|
|
}
|
|
|
|
}
|