Update.

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.

42 files changed, 617 insertions, 108 deletions

diff --git a/ChangeLog b/ChangeLog
index 4aabd417f7..a5bb211a14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+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.
+
 2000-03-22  Ulrich Drepper  <drepper@redhat.com>
 
 	* inet/getnameinfo.c (getnameinfo): Check that addrlen value is
diff --git a/elf/dl-addr.c b/elf/dl-addr.c
index 14bff06f13..b0b864fa57 100644
--- a/elf/dl-addr.c
+++ b/elf/dl-addr.c
@@ -1,5 +1,5 @@
 /* Locate the shared object symbol nearest a given address.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 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
@@ -19,7 +19,7 @@
 
 #include <dlfcn.h>
 #include <stddef.h>
-#include <elf/ldsodefs.h>
+#include <ldsodefs.h>
 
 
 int
@@ -62,8 +62,8 @@ _dl_addr (const void *address, Dl_info *info)
   info->dli_fname = match->l_name;
   info->dli_fbase = (void *) match->l_addr;
 
-  symtab = (const void *) match->l_info[DT_SYMTAB]->d_un.d_ptr;
-  strtab = (const void *) match->l_info[DT_STRTAB]->d_un.d_ptr;
+  symtab = (const void *) D_PTR (match, l_info[DT_SYMTAB]);
+  strtab = (const void *) D_PTR (match, l_info[DT_STRTAB]);
 
   /* We assume that the string table follows the symbol table, because
      there is no way in ELF to know the size of the dynamic symbol table!!  */
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
index e0bf1fbbc4..2d2b20bb2d 100644
--- a/elf/dl-debug.c
+++ b/elf/dl-debug.c
@@ -1,5 +1,5 @@
 /* Communicate dynamic linker state to the debugger at runtime.
-   Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 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
@@ -17,7 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <elf/ldsodefs.h>
+#include <ldsodefs.h>
 
 /* This structure communicates dl state to the debugger.  The debugger
    normally finds it via the DT_DEBUG entry in the dynamic section, but in
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 57d10567d1..26dd0f80a9 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
-#include <elf/ldsodefs.h>
+#include <ldsodefs.h>
 
 #include <dl-dst.h>
 
@@ -195,7 +195,7 @@ _dl_map_object_deps (struct link_map *map,
 
       if (l->l_info[DT_NEEDED] || l->l_info[AUXTAG] || l->l_info[FILTERTAG])
 	{
-	  const char *strtab = (const void *) l->l_info[DT_STRTAB]->d_un.d_ptr;
+	  const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]);
 	  struct openaux_args args;
 	  struct list *orig;
 	  const ElfW(Dyn) *d;
diff --git a/elf/dl-error.c b/elf/dl-error.c
index eda2725c5f..fbf5fce04f 100644
--- a/elf/dl-error.c
+++ b/elf/dl-error.c
@@ -1,5 +1,5 @@
 /* Error handling for runtime dynamic linker.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,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
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <elf/ldsodefs.h>
+#include <ldsodefs.h>
 #include <bits/libc-tsd.h>
 
 /* This structure communicates state between _dl_catch_error and
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index 3f2d625652..41637c5977 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -1,5 +1,5 @@
 /* Call the termination functions of loaded shared objects.
-   Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,98,99,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
@@ -17,7 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <elf/ldsodefs.h>
+#include <ldsodefs.h>
 
 void
 internal_function
diff --git a/elf/dl-init.c b/elf/dl-init.c
index c4b1e22152..c1e927180c 100644
--- a/elf/dl-init.c
+++ b/elf/dl-init.c
@@ -1,5 +1,5 @@
 /* Return the next shared object initializer function not yet run.
-   Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1998, 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
@@ -18,7 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
-#include <elf/ldsodefs.h>
+#include <ldsodefs.h>
 
 
 /* Run initializers for MAP and its dependencies, in inverse dependency
@@ -88,7 +88,7 @@ _dl_init_next (struct r_scope_elem *searchlist)
 			   l->l_name[0] ? l->l_name : _dl_argv[0],
 			   "\n\n", NULL);
 
-      array = (ElfW(Addr) *) l->l_info[DT_INIT_ARRAY]->d_un.d_ptr;
+      array = (ElfW(Addr) *) D_PTR (l, l_info[DT_INIT_ARRAY]);
       return l->l_addr + array[l->l_runcount - 2];
       /* NOTREACHED */
     }
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 4651a45265..0ec215223c 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1,5 +1,5 @@
 /* Map in a shared object's segments from the file.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,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
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <elf/ldsodefs.h>
+#include <ldsodefs.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -591,7 +591,7 @@ _dl_init_paths (const char *llp)
 	  /* Allocate room for the search path and fill in information
 	     from RUNPATH.  */
 	  l->l_runpath_dirs =
-	    decompose_rpath ((const void *) (l->l_info[DT_STRTAB]->d_un.d_ptr
+	    decompose_rpath ((const void *) (D_PTR (l, l_info[DT_STRTAB])
 					     + l->l_info[DT_RUNPATH]->d_un.d_val),
 			     l, "RUNPATH");
 
@@ -606,7 +606,7 @@ _dl_init_paths (const char *llp)
 	    /* Allocate room for the search path and fill in information
 	       from RPATH.  */
 	    l->l_rpath_dirs =
-	      decompose_rpath ((const void *) (l->l_info[DT_STRTAB]->d_un.d_ptr
+	      decompose_rpath ((const void *) (D_PTR (l, l_info[DT_STRTAB])
 					       + l->l_info[DT_RPATH]->d_un.d_val),
 			       l, "RPATH");
 	  else
@@ -1300,7 +1300,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 	  if (l->l_info[DT_SONAME] == NULL)
 	    continue;
 
-	  soname = (const void *) (l->l_info[DT_STRTAB]->d_un.d_ptr
+	  soname = (const void *) (D_PTR (l, l_info[DT_STRTAB])
 				   + l->l_info[DT_SONAME]->d_un.d_val);
 	  if (strcmp (name, soname) != 0)
 	    continue;
@@ -1343,7 +1343,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 		/* Make sure the cache information is available.  */
 		if (l->l_rpath_dirs == NULL)
 		  {
-		    size_t ptrval = (l->l_info[DT_STRTAB]->d_un.d_ptr
+		    size_t ptrval = (D_PTR (l, l_info[DT_STRTAB])
 				     + l->l_info[DT_RPATH]->d_un.d_val);
 		    l->l_rpath_dirs =
 		      decompose_rpath ((const char *) ptrval, l, "RPATH");
@@ -1373,7 +1373,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 	  /* Make sure the cache information is available.  */
 	   if (loader->l_runpath_dirs == NULL)
 	      {
-		size_t ptrval = (loader->l_info[DT_STRTAB]->d_un.d_ptr
+		size_t ptrval = (D_PTR (loader, l_info[DT_STRTAB])
 				 + loader->l_info[DT_RUNPATH]->d_un.d_val);
 		loader->l_runpath_dirs =
 		  decompose_rpath ((const char *) ptrval, loader, "RUNPATH");
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index bfe942cbb7..702fd3b824 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -1,5 +1,5 @@
 /* Look up a symbol in the loaded objects.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,2000  Free Software Foundation, Inc.
    This file is part of the GNU C Library.