diff options
Diffstat (limited to 'sysdeps/generic')
-rw-r--r-- | sysdeps/generic/dl-lookupcfg.h | 22 | ||||
-rw-r--r-- | sysdeps/generic/dl-machine.h | 7 | ||||
-rw-r--r-- | sysdeps/generic/ldsodefs.h | 66 |
3 files changed, 70 insertions, 25 deletions
diff --git a/sysdeps/generic/dl-lookupcfg.h b/sysdeps/generic/dl-lookupcfg.h new file mode 100644 index 0000000000..8ce19b8741 --- /dev/null +++ b/sysdeps/generic/dl-lookupcfg.h @@ -0,0 +1,22 @@ +/* Configuration of lookup functions. + Copyright (C) 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 + 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. */ + +/* Some platforms need more information from the symbol lookup function + than just the address. But this is not generally the case. */ +#undef DL_LOOKUP_RETURNS_MAP diff --git a/sysdeps/generic/dl-machine.h b/sysdeps/generic/dl-machine.h index d74aebeb6d..a23f178034 100644 --- a/sysdeps/generic/dl-machine.h +++ b/sysdeps/generic/dl-machine.h @@ -52,11 +52,12 @@ elf_machine_load_address (void) /* Fixup a PLT entry to bounce directly to the function at VALUE. */ -static inline void -elf_machine_fixup_plt (struct link_map *map, const Elf32_Rel *reloc, +static inline Elf32_Addr +elf_machine_fixup_plt (struct link_map *map, lookup_t t, + const Elf32_Rel *reloc, Elf32_Addr *reloc_addr, Elf32_Addr value) { - *reloc_addr = value; + return *reloc_addr = value; } /* Perform the relocation specified by RELOC and SYM (which is fully resolved). diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index ff58115f1c..4fc1578a95 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -30,6 +30,7 @@ #include <elf.h> #include <dlfcn.h> #include <link.h> +#include <dl-lookupcfg.h> __BEGIN_DECLS @@ -49,6 +50,27 @@ __BEGIN_DECLS # define D_PTR(map,i) map->i->d_un.d_ptr #endif +/* On some platforms more information than just the address of the symbol + is needed from the lookup functions. In this case we return the whole + link map. */ +#ifdef DL_LOOKUP_RETURNS_MAP +typedef struct link_map *lookup_t; +# define LOOKUP_VALUE(map) map +# define LOOKUP_VALUE_ADDRESS(map) (map ? map->l_addr : 0) +#else +typedef ElfW(Addr) lookup_t; +# define LOOKUP_VALUE(map) map->l_addr +# define LOOKUP_VALUE_ADDRESS(address) address +#endif + +/* on some architectures a pointer to a function is not just a pointer + to the actual code of the function but rather an architecture + specific descriptor. */ +#ifndef ELF_FUNCTION_PTR_IS_SPECIAL +#define DL_SYMBOL_ADDRESS(map, ref) \ + (void *) (LOOKUP_VALUE_ADDRESS (map) + ref->st_value) +#endif + /* For the version handling we need an array with only names and their hash values. */ struct r_found_version @@ -271,38 +293,38 @@ extern void _dl_setup_hash (struct link_map *map) internal_function; RELOC_TYPE is a machine-dependent reloc type, which is passed to the `elf_machine_lookup_*_p' macros in dl-machine.h to affect which symbols can be chosen. */ -extern ElfW(Addr) _dl_lookup_symbol (const char *undef, - struct link_map *undef_map, - const ElfW(Sym) **sym, - struct r_scope_elem *symbol_scope[], - int reloc_type) +extern lookup_t _dl_lookup_symbol (const char *undef, + struct link_map *undef_map, + const ElfW(Sym) **sym, + struct r_scope_elem *symbol_scope[], + int reloc_type) internal_function; /* Lookup versioned symbol. */ -extern ElfW(Addr) _dl_lookup_versioned_symbol (const char *undef, - struct link_map *undef_map, - const ElfW(Sym) **sym, - struct r_scope_elem *symbol_scope[], - const struct r_found_version *version, - int reloc_type) +extern lookup_t _dl_lookup_versioned_symbol (const char *undef, + struct link_map *undef_map, + const ElfW(Sym) **sym, + struct r_scope_elem *symbol_scope[], + const struct r_found_version *version, + int reloc_type) internal_function; /* For handling RTLD_NEXT we must be able to skip shared objects. */ -extern ElfW(Addr) _dl_lookup_symbol_skip (const char *undef, - struct link_map *undef_map, - const ElfW(Sym) **sym, - struct r_scope_elem *symbol_scope[], - struct link_map *skip_this) +extern lookup_t _dl_lookup_symbol_skip (const char *undef, + struct link_map *undef_map, + const ElfW(Sym) **sym, + struct r_scope_elem *symbol_scope[], + struct link_map *skip_this) internal_function; /* For handling RTLD_NEXT with versioned symbols we must be able to skip shared objects. */ -extern ElfW(Addr) _dl_lookup_versioned_symbol_skip (const char *undef, - struct link_map *undef_map, - const ElfW(Sym) **sym, - struct r_scope_elem *symbol_scope[], - const struct r_found_version *version, - struct link_map *skip_this) +extern lookup_t _dl_lookup_versioned_symbol_skip (const char *undef, + struct link_map *undef_map, + const ElfW(Sym) **sym, + struct r_scope_elem *symbol_scope[], + const struct r_found_version *version, + struct link_map *skip_this) internal_function; /* Look up symbol NAME in MAP's scope and return its run-time address. */ |