diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-03-16 07:40:05 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-03-16 07:40:05 +0000 |
| commit | a986484f67346b28ff09833c1f4fd3505b52138e (patch) | |
| tree | 598498dabf381610b1d7e27815917d67426bc34a /sysdeps/generic/dl-cache.c | |
| parent | 328c5f650ffcdc8f10e4ebd6f741ad0b8e6ea1c1 (diff) | |
| download | glibc-a986484f67346b28ff09833c1f4fd3505b52138e.tar.gz glibc-a986484f67346b28ff09833c1f4fd3505b52138e.tar.xz glibc-a986484f67346b28ff09833c1f4fd3505b52138e.zip | |
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.
Diffstat (limited to 'sysdeps/generic/dl-cache.c')
| -rw-r--r-- | sysdeps/generic/dl-cache.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c index 5e16f2852a..65135d467d 100644 --- a/sysdeps/generic/dl-cache.c +++ b/sysdeps/generic/dl-cache.c @@ -228,6 +228,8 @@ _dl_load_cache_lookup (const char *name) /* Only accept hwcap if it's for the right platform. */ #define HWCAP_CHECK \ + if (_dl_osversion && cache_new->libs[middle].osversion > _dl_osversion) \ + continue; \ if (_DL_PLATFORMS_COUNT && platform != -1 \ && (cache_new->libs[middle].hwcap & _DL_HWCAP_PLATFORM) != 0 \ && (cache_new->libs[middle].hwcap & _DL_HWCAP_PLATFORM) != platform) \ |