mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
a986484f67
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.
63 lines
2.3 KiB
C
63 lines
2.3 KiB
C
/* Copyright (C) 1999, 2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Andreas Jaeger <aj@suse.de>, 1999 and
|
|
Jakub Jelinek <jakub@redhat.com>, 1999.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
int process_elf32_file (const char *file_name, const char *lib, int *flag,
|
|
unsigned int *osversion, char **soname,
|
|
void *file_contents, size_t file_length);
|
|
int process_elf64_file (const char *file_name, const char *lib, int *flag,
|
|
unsigned int *osversion, char **soname,
|
|
void *file_contents, size_t file_length);
|
|
|
|
/* Returns 0 if everything is ok, != 0 in case of error. */
|
|
int
|
|
process_elf_file (const char *file_name, const char *lib, int *flag,
|
|
unsigned int *osversion, char **soname, void *file_contents,
|
|
size_t file_length)
|
|
{
|
|
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
|
|
int ret;
|
|
|
|
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
|
|
return process_elf32_file (file_name, lib, flag, osversion, soname,
|
|
file_contents, file_length);
|
|
else
|
|
{
|
|
ret = process_elf64_file (file_name, lib, flag, osversion, soname,
|
|
file_contents, file_length);
|
|
/* Sparc 64bit libraries are always libc.so.6+. */
|
|
if (!ret)
|
|
*flag = FLAG_SPARC_LIB64|FLAG_ELF_LIBC6;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
#undef __ELF_NATIVE_CLASS
|
|
#undef process_elf_file
|
|
#define process_elf_file process_elf32_file
|
|
#define __ELF_NATIVE_CLASS 32
|
|
#include "sysdeps/generic/readelflib.c"
|
|
|
|
#undef __ELF_NATIVE_CLASS
|
|
#undef process_elf_file
|
|
#define process_elf_file process_elf64_file
|
|
#define __ELF_NATIVE_CLASS 64
|
|
#include "sysdeps/generic/readelflib.c"
|