mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-01 03:27:48 +00:00
a42195dbe4
2000-03-23 Andreas Jaeger <aj@suse.de> * elf/dl-addr.c: Adjust include paths for ldsodefs location change. * elf/dl-debug.c: Likewise. * elf/dl-deps.c: Likewise. * elf/dl-error.c: Likewise. * elf/dl-fini.c: Likewise. * elf/dl-init.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-minimal.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-preinit.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-profstub.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-symbol.c: Likewise. * elf/dl-version.c: Likewise. * elf/rtld.c: Likewise. * elf/sprof.c: Likewise. * sysdeps/generic/dl-cache.c: Likewise. * sysdeps/generic/dl-origin.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/elf/backtracesyms.c: Likewise. * sysdeps/generic/elf/backtracesymsfd.c: Likewise. * sysdeps/generic/libc-start.c: Likewise. * sysdeps/mach/hurd/dl-sysdep.c: Likewise. * sysdeps/powerpc/dl-machine.c: Likewise. * sysdeps/powerpc/elf/libc-start.c: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/unix/sysv/linux/dl-origin.c: Likewise. * elf/ldsodefs.h: Move file to ... * sysdeps/generic/ldsodefs.h: ... here. * sysdeps/generic/ldsodefs.h: Add definition for D_PTR. * sysdeps/mips/elf/ldsodefs.h: New file. * elf/dl-version.c (match_symbol): Use D_PTR to access relocated entries in l_info. (_dl_check_map_versions): Likewise. * elf/dl-reloc.c (_dl_relocate_object): Likewise. * elf/dl-load.c (_dl_init_paths): Likewise. (_dl_map_object): Likewise. * elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Likewise. (elf_get_dynamic_info): Likewise. * elf/do-lookup.h (FCT): Likewise. * elf/do-rel.h (elf_dynamic_do_rel): Likewise. * elf/dl-deps.c (_dl_map_object_deps): Likewise. * elf/dl-addr.c (_dl_addr): Likewise. * elf/dl-runtime.c (profile_fixup): Likewise. (fixup): Likewise. * elf/dl-init.c (_dl_init_next): Likewise. * sysdeps/generic/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/unix/sysv/linux/i386/dl-librecon.h (DISTINGUISH_LIB_VERSIONS): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_runtime_setup): Likewise. (elf_machine_rel): Likewise. * elf/dynamic-link.h (elf_get_dynamic_info): Only change l_info for writable dynamic section.
62 lines
2.4 KiB
C
62 lines
2.4 KiB
C
/* Optional code to distinguish library flavours.
|
|
Copyright (C) 1998 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
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. */
|
|
|
|
#ifndef _DL_LIBRECON_H
|
|
#define _DL_LIBRECON_H 1
|
|
|
|
#define DISTINGUISH_LIB_VERSIONS \
|
|
do \
|
|
{ \
|
|
/* We have to find out whether the binary is linked against \
|
|
libc 5 or glibc. We do this by looking at all the DT_NEEDED \
|
|
entries. If one is libc.so.5 this is a libc 5 linked binary. */ \
|
|
if (_dl_loaded->l_info[DT_NEEDED]) \
|
|
{ \
|
|
/* We have dependencies. */ \
|
|
const ElfW(Dyn) *d; \
|
|
const char *strtab; \
|
|
\
|
|
strtab = (const char *) D_PTR (_dl_loaded, l_info[DT_STRTAB]); \
|
|
\
|
|
for (d = _dl_loaded->l_ld; d->d_tag != DT_NULL; ++d) \
|
|
if (d->d_tag == DT_NEEDED \
|
|
&& strcmp (strtab + d->d_un.d_val, "libc.so.5") == 0) \
|
|
break; \
|
|
\
|
|
/* We print a `5' or `6' depending on the outcome. */ \
|
|
_dl_sysdep_message (d->d_tag != DT_NULL ? "5\n" : "6\n", NULL); \
|
|
} \
|
|
} \
|
|
while (0)
|
|
|
|
/* Recognizing extra environment variables. */
|
|
#define EXTRA_LD_ENVVARS \
|
|
case 15: \
|
|
if (memcmp (&envline[3], "LIBRARY_VERSION", 15) == 0) \
|
|
{ \
|
|
_dl_correct_cache_id = envline[19] == '5' ? 2 : 3; \
|
|
break; \
|
|
}
|
|
|
|
/* Extra unsecure variables. */
|
|
#define EXTRA_UNSECURE_ENVVARS "LD_AOUT_LIBRARY_PATH", "LD_AOUT_PRELOAD"
|
|
|
|
#endif /* dl-librecon.h */
|