update from main archive 970202 cvs/libc-970203

1997-02-03 02:33  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dl-deps.c (_dl_map_object_deps): Handle multiple AUXILIARY
	entries.  This is still no complete implementation since AUXILIARY
	entries in other shared objects are not yet handled.

	* libio/libio.h (_IO_cookie_io_functions_t): Move to C++ protected
	place.

	* po/es.po: Update.
	* po/fr.po: Update.
	* po/nl.po: Update.

	* time/Makefile: Better cross-compile support.  Avoid test which
	cannot be run.
	(CFLAGS-tzset.c): New variable.  Overwrite TZDEFAULT value from
	tzfile.h file.
	* time/tzfile.c (__tzfile_read): Allow TZDEFAULT start with '/' even
	in SUID programs.
	* time/tzset.c (__tzset_internal): If TZ envvar is not set use same
	default values as in tzfile.c.

	* elf/dynamic-link.h (elf_get_dynamic_info): Recognize versioning
	tags.
	* elf/link.h: Likewise.
	* elf/elf.h: Add tag definitions and data structures for versioning.

1997-02-03 02:17  Ulrich Drepper  <drepper@cygnus.com>

	* nis/rpcsvc/yp.x (struct ypresp_key_val): There is not stupid
	"Sun bug".  This is the order of elements also used by 4.4BSD.
	* nis/rpcsvc/yp.h: Likewise.
	Reported by HJ Lu.

1997-02-02 12:13  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* sunrpc/Makefile ($(objpfx)x%.h, $(objpfx)x%.c): Add "@:" as
	action.

	* Makefile (install): Pass installation directories as arguments
	to ldconfig.

1997-02-02 23:15  Ulrich Drepper  <drepper@cygnus.com>

	* malloc/malloc.c (__after_morecore_hook): New variable.
	(malloc_extend_top): Call __after_morecore_hook if set.
	(main_trim): Likewise.
	* malloc/malloc.h: Add declaration of __after_morecore_hook.
	Suggested by Marcus Daniels.

1997-02-02 23:00  Marcus G. Daniels  <marcus@tdb.com>

	* malloc/malloc.c (rEALLOc): Protect tsd_setspecific call by
	#ifndef NO_THREADS.
	(mallinfo): Likewise.

	* malloc/malloc.c (__morecore): Make external since it is used in
	programs.

1997-02-02 15:10  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/statbuf.h (struct stat): Make st_dev field
	unsigned.

1997-02-01 23:36  Richard Henderson  <rth@tamu.edu>

	* sysdeps/alpha/stxncpy.S ($unaligned) [src % 8 > dst % 8]: Don't
	use t6 as a temporary; it contains bits we still need in $u_head.

1997-01-31 15:05  John Bowman  <bowman@ipp-garching.mpg.de>

	* sysdeps/i386/fpu/__math.h [__USE_MISC]: Don't declare prototypes
	using __ prefix.  Add prototype for log1p.

1 files changed, 47 insertions, 26 deletions

diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index f034196762..7a6772979b 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -32,7 +32,7 @@ _dl_map_object_deps (struct link_map *map,
       struct link_map *map;
       struct list *next;
     };
-  struct list head[2 + npreloads], *tailp, *scanp;
+  struct list *head, *tailp, *scanp;
   struct list duphead, *duptailp;
   unsigned int nduplist;
   unsigned int nlist, naux, i;
@@ -49,36 +49,57 @@ _dl_map_object_deps (struct link_map *map,
 
   naux = nlist = 0;
 
-#define AUXTAG	(DT_NUM + DT_PROCNUM + DT_EXTRATAGIDX (DT_AUXILIARY))
+  /* XXX The AUXILIARY implementation isn't correct in the moment. XXX
+     XXX The problem is that we currently do not handle auxiliary  XXX
+     XXX entries in the loaded objects.				   XXX */
 
+#define AUXTAG	(DT_NUM + DT_PROCNUM + DT_VERSIONTAGNUM \
+		 + DT_EXTRATAGIDX (DT_AUXILIARY))
+
+  /* First determine the number of auxiliary objects we have to load.  */
   if (map->l_info[AUXTAG])
     {
-      /* There is an auxiliary library specified.  We try to load it,
-	 and if we can, use its symbols in preference to our own.
-	 But if we can't load it, we just silently ignore it.
-	 XXX support multiple DT_AUXILIARYs?
-       */
-      struct link_map *aux;
-      void openaux (void)
-	{
-	  const char *strtab
-	    = ((void *) map->l_addr + map->l_info[DT_STRTAB]->d_un.d_ptr);
-	  aux = _dl_map_object (map, strtab + map->l_info[AUXTAG]->d_un.d_val,
-				map->l_type == lt_executable ? lt_library :
-				map->l_type, trace_mode);
-	}
-      char *errstring;
-      const char *objname;
-      if (! _dl_catch_error (&errstring, &objname, &openaux))
-	{
-	  /* The auxiliary object is actually there.  Use it
-	     as the first search element, even before MAP itself.  */
-	  preload (aux);
-	  naux = 1;
-	}
+      ElfW(Dyn) *d;
+      for (d = map->l_ld; d->d_tag != DT_NULL; ++d)
+	if (d->d_tag == DT_AUXILIARY)
+	  ++naux;
+    }
+
+  /* Now we can allocate the array for the linker maps. */
+  head = (struct list *) alloca (sizeof (struct list)
+				 * (naux + npreloads + 2));
+
+  /* Load the auxiliary objects, even before the object itself.  */
+  if (map->l_info[AUXTAG])
+    {
+      /* There is at least one auxiliary library specified.  We try to
+	 load it, and if we can, use its symbols in preference to our
+	 own.  But if we can't load it, we just silently ignore it.  */
+      const char *strtab
+	= ((void *) map->l_addr + map->l_info[DT_STRTAB]->d_un.d_ptr);
+      ElfW(Dyn) *d;
+
+      for (d = map->l_ld; d->d_tag != DT_NULL; ++d)
+	if (d->d_tag == DT_AUXILIARY)
+	  {
+	    struct link_map *aux;
+	    void openaux (void)
+	      {
+		aux = _dl_map_object (map, strtab + d->d_un.d_val,
+				      (map->l_type == lt_executable
+				       ? lt_library : map->l_type),
+				      trace_mode);
+	      }
+	    char *errstring;
+	    const char *objname;
+	    if (! _dl_catch_error (&errstring, &objname, openaux))
+	      /* The auxiliary object is actually there.  Use it as
+		 the first search element, even before MAP itself.  */
+	      preload (aux);
+	  }
     }
 
-  /* Start the search list with one element: MAP itself.  */
+  /* Next load MAP itself.  */
   preload (map);
 
   /* Add the preloaded items after MAP but before any of its dependencies.  */