mirror of
https://sourceware.org/git/glibc.git
synced 2026-01-06 11:51:29 +03:00
Update.
2000-05-05 Ulrich Drepper <drepper@redhat.com> * elf/dl-load.c (_dl_map_object_from_fd): Little of computation of parameter to mprotect and for variable assignments. 2000-05-03 Jes Sorensen <jes@linuxcare.com> * sysdeps/generic/ldsodefs.h (LOOKUP_VALUE_ADDRESS): Check the validity of map before dereferencing it. * elf/dl-reloc.c (RESOLVE_MAP): Define. 2000-05-02 Jes Sorensen <jes@linuxcare.com> * elf/dl-runtime.c (fixup): Add the value returned in the symbol lookup to the arguments to elf_machine_fixup_plt(). * sysdeps/ia64/dl-machine.h (elf_machine_fixup_plt): Add Link_map of the symbol being resolved to input argument list and make the function return the pointer to the reloc. * sysdeps/alpha/dl-machine.h (elf_machine_fixup_plt): Change return valuie to lookup_t and return the value. * sysdeps/arm/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/generic/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/powerpc/dl-machine.h (elf_machine_fixup_plt): Likewise. Make it an inline function returning value after calling __elf_machine_fixup_plt(). * elf/dl-sym.c (_dl_vsym): Use DL_SYMBOL_ADDRESS() to obtain the symbol address. * elf/dl-symbol.c (_dl_symbol_value): Use LOOKUP_VALUE_ADDRESS to obtain the symbol address. * sysdeps/generic/ldsodefs.h: Add generic DL_SYMBOL_ADDRESS() macro depending on the definition of ELF_FUNCTION_PTR_IS_SPECIAL. * sysdeps/ia64/dl-machine.h: Add DL_SYMBOL_ADDRESS() macro calling _dl_symbol_address() - this way DL_SYMBOL_ADDRESS() turns into an inline on non ia64. 2000-04-28 Jes Sorensen <jes@linuxcare.com> * elf/dl-runtime.c (fixup): Use the portable macros to get the symbol address of an object. * elf/dl-runtime.c (fixup-profile): Use the portable macros to get the symbol address of an object. * elf/dl-libc.c (struct do_dlsym_args): Change loadbase to a lookup_t. * elf/dl-lookup.c (_dl_lookup_symbol): Likewise. (_dl_lookup_symbol_skip): Likewise. (_dl_lookup_versioned_symbol): Likewise. (_dl_lookup_versioned_symbol_skip): Likewise. 2000-04-27 Jes Sorensen <jes@linuxcare.com> * elf/rtld.c (_dl_start): Get the function pointer return address via _dl_start_address for architectures that need a function pointer descriptor rather than just a pointer (ia64). * sysdeps/generic/dl-lookupcfg.h: New file. * sysdeps/ia64/dl-lookupcfg.h: New file. * sysdeps/ia64/dl-machine.h: New file. * sysdeps/ia64/dl-symaddr.c: New file. * sysdeps/ia64/dl-fptr.c: New file. * elf/elf.h: Add IA-64 specific definitions.
This commit is contained in:
39
elf/dl-sym.c
39
elf/dl-sym.c
@@ -1,5 +1,5 @@
|
||||
/* Look up a symbol in a shared object loaded by `dlopen'.
|
||||
Copyright (C) 1999 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999, 2000 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
|
||||
@@ -29,12 +29,12 @@ void *
|
||||
internal_function
|
||||
_dl_sym (void *handle, const char *name, void *who)
|
||||
{
|
||||
ElfW(Addr) loadbase;
|
||||
const ElfW(Sym) *ref = NULL;
|
||||
lookup_t result;
|
||||
|
||||
if (handle == RTLD_DEFAULT)
|
||||
/* Search the global scope. */
|
||||
loadbase = _dl_lookup_symbol (name, NULL, &ref, _dl_global_scope, 0);
|
||||
result = _dl_lookup_symbol (name, NULL, &ref, _dl_global_scope, 0);
|
||||
else
|
||||
{
|
||||
struct link_map *l, *match;
|
||||
@@ -56,8 +56,8 @@ _dl_sym (void *handle, const char *name, void *who)
|
||||
main program (we hope). */
|
||||
match = _dl_loaded;
|
||||
|
||||
loadbase = _dl_lookup_symbol (name, match, &ref, map->l_local_scope,
|
||||
0);
|
||||
result = _dl_lookup_symbol (name, match, &ref, map->l_local_scope,
|
||||
0);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -69,13 +69,13 @@ RTLD_NEXT used in code not dynamically loaded"));
|
||||
while (l->l_loader)
|
||||
l = l->l_loader;
|
||||
|
||||
loadbase = _dl_lookup_symbol_skip (name, l, &ref, l->l_local_scope,
|
||||
match);
|
||||
result = _dl_lookup_symbol_skip (name, l, &ref, l->l_local_scope,
|
||||
match);
|
||||
}
|
||||
}
|
||||
|
||||
if (loadbase)
|
||||
return (void *) (loadbase + ref->st_value);
|
||||
if (result)
|
||||
return DL_SYMBOL_ADDRESS (result, ref);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -84,9 +84,9 @@ void *
|
||||
internal_function
|
||||
_dl_vsym (void *handle, const char *name, const char *version, void *who)
|
||||
{
|
||||
ElfW(Addr) loadbase;
|
||||
const ElfW(Sym) *ref = NULL;
|
||||
struct r_found_version vers;
|
||||
lookup_t result;
|
||||
|
||||
/* Compute hash value to the version string. */
|
||||
vers.name = version;
|
||||
@@ -97,8 +97,8 @@ _dl_vsym (void *handle, const char *name, const char *version, void *who)
|
||||
|
||||
if (handle == RTLD_DEFAULT)
|
||||
/* Search the global scope. */
|
||||
loadbase = _dl_lookup_versioned_symbol (name, NULL, &ref, _dl_global_scope,
|
||||
&vers, 0);
|
||||
result = _dl_lookup_versioned_symbol (name, NULL, &ref, _dl_global_scope,
|
||||
&vers, 0);
|
||||
else if (handle == RTLD_NEXT)
|
||||
{
|
||||
struct link_map *l, *match;
|
||||
@@ -118,20 +118,19 @@ RTLD_NEXT used in code not dynamically loaded"));
|
||||
while (l->l_loader)
|
||||
l = l->l_loader;
|
||||
|
||||
loadbase = _dl_lookup_versioned_symbol_skip (name, l, &ref,
|
||||
l->l_local_scope,
|
||||
&vers, match);
|
||||
result = _dl_lookup_versioned_symbol_skip (name, l, &ref,
|
||||
l->l_local_scope,
|
||||
&vers, match);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Search the scope of the given object. */
|
||||
struct link_map *map = handle;
|
||||
loadbase = _dl_lookup_versioned_symbol (name, map, &ref,
|
||||
map->l_local_scope, &vers, 0);
|
||||
result = _dl_lookup_versioned_symbol (name, map, &ref,
|
||||
map->l_local_scope, &vers, 0);
|
||||
}
|
||||
|
||||
if (loadbase)
|
||||
return (void *) (loadbase + ref->st_value);
|
||||
|
||||
if (result)
|
||||
return DL_SYMBOL_ADDRESS (result, ref);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user