mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
266180eb98
* sysdeps/mach/hurd/dl-sysdep.c (__open): Define this instead of open. (__close, __mmap): Likewise define with __ names now. Mon Jun 10 05:13:18 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * elf/dl-support.c: New file. * elf/Makefile (CFLAGS-dl-support.c): New variable. (routines, elide-routines.so): Add dl-support. * elf/dl-minimal.c (_dl_pagesize): Remove common defn. * elf/dl-load.c (_dl_pagesize): Define it here. (_dl_map_object_from_fd): Initialize it if zero. * elf/link.h (_dl_pagesize): Remove const. Sun Jun 9 04:04:26 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * elf/Makefile (routines): Add dl-symbol. * elf/dl-lookup.c (_dl_symbol_value): Moved to ... * elf/dl-symbol.c: New file. * elf/elf.h (Elf32_Xword, Elf32_Sxword): New types. (Elf32_Section, Elf64_Section): New types, 16 bits. (Elf32_Sym, Elf64_Sym): Use it. * elf/dl-deps.c (_dl_open): Moved to ... * elf/dl-open.c: New file. * Makefile (routines): Add dl-open. * elf/Makefile (dl-routines): New variable. (routines): Add $(dl-routines). (elide-routines.so): New variable, set to $(dl-routines). (libdl-inhibit-o): Variable removed; build all flavors of -ldl. (rtld-routines): All but rtld, dl-sysdep, and dl-minimal moved to $(dl-routines). * elf/dl-lookup.c (_dl_lookup_symbol): Remove magic symbol grokage. * elf/dladdr.c: Use ELFW(ST_BIND) in place of ELF32_ST_BIND. * elf/dl-load.c (open_path): Use __ names for open and close. Avoid using strdup. (_dl_map_object): Likewise. (_dl_map_object_from_fd): Use __ names for mmap, munmap, and mprotect. * elf/dl-minimal.c (malloc): Likewise. * elf/dl-reloc.c (_dl_relocate_object): Likewise. * elf/dl-minimal.c (_dl_pagesize): New variable. (malloc): Use that instead of a static variable. * elf/dl-reloc.c (_dl_relocate_object): Use _dl_pagesize instead of calling getpagesize. * elf/dl-load.c (_dl_map_object_from_fd): Likewise. * elf/link.h: Declare _dl_pagesize. * elf/rtld.c (dl_r_debug): Renamed to _dl_r_debug. * elf/link.h (struct link_map): Use Half for l_phnum instead of Word. * elf/rtld.c (dl_main): Use Half for phdr count arg. (_dl_sysdep_start): Update prototype of DL_MAIN function ptr arg. * elf/dl-load.c (_dl_map_object_from_fd): Use explicit Elf32_Word to extract 4-byte magic number, not ElfW(Word). Match EI_CLASS against native wordsize, either 32 or 64. * elf/elf.h (Elf64_Byte, Elf64_Section): Typedefs removed. In C a char is always a byte, no need for a typedef. Section indices are 16-bit quantities in elf64, which already have a typedef Elf64_Half. Remove partial -lelf implementation. There is now a separately-distributed `libelf' package that implements it. * elf/dl-lookup.c: Don't #include <libelf.h> any more. (_dl_elf_hash): New function, moved from libelf.h:elf_hash. (_dl_lookup_symbol): Use it instead of elf_hash. * elf/libelf.h: File removed. * elf/elf_hash.c: File removed. * elf/Makefile (headers): Remove libelf.h. (extra-libs): Remove libelf. (libelf-routines): Variable removed. * elf/Makefile (libdl.so): Remove commands from this target. The implicit rule commands are correct, this explicit rule just serves to add some dependencies. * elf/dl-lookup.c (_dl_lookup_symbol): Use ELFW(ST_TYPE) in place of ELF32_ST_TYPE. Likewise ST_BIND. * elf/do-rel.h (elf_dynamic_do_rel): Likewise R_SYM. * elf/link.h (ElfW): New macro for wordsize-independent ElfXX_* type naming. (ELFW): New macro, likewise for ELFXX_* macro naming. (_ElfW, _ElfW_1): New macros, subroutines of ElfW and ELF. Sat Jun 8 20:52:38 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * elf/link.h, elf/do-rel.h, elf/dynamic-link.h, elf/dl-deps.c, elf/dl-init.c, elf/dl-load.c, elf/dl-lookup.c, elf/dl-reloc.c, elf/dl-runtime.c, elf/dladdr.c, elf/dlclose.c, elf/dlsym.c, elf/linux-compat.c, elf/rtld.c: Change all uses of `Elf32_XXX' to `ElfW(XXX)' for wordsize-independence. Sat Jun 8 20:50:42 1996 Richard Henderson <rth@tamu.edu> * elf/elf.h: Move Elf64_* types in parity with Elf32 counterparts. (Elf64_auxv_t): New type. (EM_ALPHA, R_ALPHA_*): New macros for elf64-alpha format.
161 lines
4.5 KiB
C
161 lines
4.5 KiB
C
/* Look up a symbol in the loaded objects.
|
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <stddef.h>
|
|
#include <link.h>
|
|
#include <assert.h>
|
|
|
|
|
|
/* This is the hashing function specified by the ELF ABI. */
|
|
static inline unsigned
|
|
_dl_elf_hash (const char *name)
|
|
{
|
|
unsigned long int hash = 0;
|
|
while (*name != '\0')
|
|
{
|
|
unsigned long int hi;
|
|
hash = (hash << 4) + *name++;
|
|
hi = hash & 0xf0000000;
|
|
if (hi != 0)
|
|
{
|
|
hash ^= hi >> 24;
|
|
/* The ELF ABI says `hash &= ~hi', but this is equivalent
|
|
in this case and on some machines one insn instead of two. */
|
|
hash ^= hi;
|
|
}
|
|
}
|
|
return hash;
|
|
}
|
|
|
|
/* Search loaded objects' symbol tables for a definition of the symbol
|
|
UNDEF_NAME. The chosen value can't be RELOC_ADDR. If NOPLT is nonzero,
|
|
then a PLT entry cannot satisfy the reference; some different binding
|
|
must be found. */
|
|
|
|
ElfW(Addr)
|
|
_dl_lookup_symbol (const char *undef_name, const ElfW(Sym) **ref,
|
|
struct link_map *symbol_scope[2],
|
|
const char *reference_name,
|
|
ElfW(Addr) reloc_addr,
|
|
int noplt)
|
|
{
|
|
const unsigned long int hash = _dl_elf_hash (undef_name);
|
|
struct
|
|
{
|
|
ElfW(Addr) a;
|
|
const ElfW(Sym) *s;
|
|
} weak_value = { 0, NULL };
|
|
size_t i;
|
|
struct link_map **scope, *map;
|
|
|
|
/* Search the relevant loaded objects for a definition. */
|
|
for (scope = symbol_scope; scope < &symbol_scope[2]; ++scope)
|
|
if (*scope)
|
|
for (i = 0; i < (*scope)->l_nsearchlist; ++i)
|
|
{
|
|
const ElfW(Sym) *symtab;
|
|
const char *strtab;
|
|
ElfW(Word) symidx;
|
|
|
|
map = (*scope)->l_searchlist[i];
|
|
|
|
symtab = ((void *) map->l_addr + map->l_info[DT_SYMTAB]->d_un.d_ptr);
|
|
strtab = ((void *) map->l_addr + map->l_info[DT_STRTAB]->d_un.d_ptr);
|
|
|
|
/* Search the appropriate hash bucket in this object's symbol table
|
|
for a definition for the same symbol name. */
|
|
for (symidx = map->l_buckets[hash % map->l_nbuckets];
|
|
symidx != STN_UNDEF;
|
|
symidx = map->l_chain[symidx])
|
|
{
|
|
const ElfW(Sym) *sym = &symtab[symidx];
|
|
|
|
if (sym->st_value == 0 || /* No value. */
|
|
/* Cannot resolve to the location being filled in. */
|
|
reloc_addr == map->l_addr + sym->st_value ||
|
|
(noplt && sym->st_shndx == SHN_UNDEF)) /* Reject PLT. */
|
|
continue;
|
|
|
|
switch (ELFW(ST_TYPE) (sym->st_info))
|
|
{
|
|
case STT_NOTYPE:
|
|
case STT_FUNC:
|
|
case STT_OBJECT:
|
|
break;
|
|
default:
|
|
/* Not a code/data definition. */
|
|
continue;
|
|
}
|
|
|
|
if (sym != *ref && strcmp (strtab + sym->st_name, undef_name))
|
|
/* Not the symbol we are looking for. */
|
|
continue;
|
|
|
|
switch (ELFW(ST_BIND) (sym->st_info))
|
|
{
|
|
case STB_GLOBAL:
|
|
/* Global definition. Just what we need. */
|
|
*ref = sym;
|
|
return map->l_addr;
|
|
case STB_WEAK:
|
|
/* Weak definition. Use this value if we don't find
|
|
another. */
|
|
if (! weak_value.s)
|
|
{
|
|
weak_value.s = sym;
|
|
weak_value.a = map->l_addr;
|
|
}
|
|
break;
|
|
default:
|
|
/* Local symbols are ignored. */
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (weak_value.s == NULL && ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
|
|
{
|
|
/* We could find no value for a strong reference. */
|
|
const char msg[] = "undefined symbol: ";
|
|
char buf[sizeof msg + strlen (undef_name)];
|
|
memcpy (buf, msg, sizeof msg - 1);
|
|
memcpy (&buf[sizeof msg - 1], undef_name,
|
|
sizeof buf - sizeof msg + 1);
|
|
_dl_signal_error (0, reference_name, buf);
|
|
}
|
|
|
|
*ref = weak_value.s;
|
|
return weak_value.a;
|
|
}
|
|
|
|
|
|
/* Cache the location of MAP's hash table. */
|
|
|
|
void
|
|
_dl_setup_hash (struct link_map *map)
|
|
{
|
|
ElfW(Word) *hash = (void *) map->l_addr + map->l_info[DT_HASH]->d_un.d_ptr;
|
|
ElfW(Word) nchain;
|
|
map->l_nbuckets = *hash++;
|
|
nchain = *hash++;
|
|
map->l_buckets = hash;
|
|
hash += map->l_nbuckets;
|
|
map->l_chain = hash;
|
|
}
|