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.

1 files changed, 44 insertions, 22 deletions

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.  */