summary refs log tree commit diff
path: root/elf/dl-deps.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-08-24 10:55:18 +0000
committerUlrich Drepper <drepper@redhat.com>1997-08-24 10:55:18 +0000
commitf41c80910d631bacdaf39ec6d11272db79c59d38 (patch)
tree26b93c7b36e05eb08892aa730788c8f772efe2e3 /elf/dl-deps.c
parent40a55d2054ef9d9085c4e6b0157c5d30608736fc (diff)
downloadglibc-f41c80910d631bacdaf39ec6d11272db79c59d38.tar.gz
glibc-f41c80910d631bacdaf39ec6d11272db79c59d38.tar.xz
glibc-f41c80910d631bacdaf39ec6d11272db79c59d38.zip
Update.
1997-08-24 12:24  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in (INSTALL): Quote `$'.

	* libc.map: Add __xpg_basename.

	* csu/Makefile (initfini.s): Disable optimization.

	* elf/dl-deps.c: Implement handling of DL_FILTER.

	* elf/dl-load.c (_dl_init_paths): Add error check.

	* intl/finddomain.c (_nl_find_domain): Correct comment.
	* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.

	* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
	Change extern inline functions to work correctly in C++.

	* locale/iso-4217.def: Update for more recent ISO 4217 version.

	* locale/loadlocale.c (_nl_load_locale): Add cast.

	* manual/message.texi: Finish gettext section.

	* posix/getopt_init.c: Don't use relative #include path.
	(__getopt_clean_environment): Change function to take pointer to
	environment as argument.  Optimize generation of test string a bit.
	* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
	with additional argument.

	* poisx/glob.c: Add prototype for next_brace_sub.

	* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
	vector.

	* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
	to not generate relocation entry.  Suggested by Richard Henderson.
	(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
	(elf_machine_runtime_setup): Add .aligns.

	* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.

	* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
	1997-08-14 03:14.  gcc 2.7.2* is really broken in some aspects.

	* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
	* sysdeps/standalone/i960/i960ca.h: Likewise.

1997-08-22 19:04  Richard Henderson  <rth@cygnus.com>

	* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
	undocumented test addition in _dl_map_object.

	Support ET_EXEC versions of ld.so, for debugging at least:

	* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
	called despite the DT_SONAME != NULL test, segfaulting.  Simplify
	the code here as well.
	* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
	(_dl_setup_hash): Likewise for hash tables.
	* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
	* elf/rtld.c (_dl_start): Likewise for rpath.
	(_dl_rtld_libname2): New variable.
	(dl_main): Use it to add an soname for ourselves when we don't have
	one of our own.  Base it on the target's .interp.
	(dl_main): Again, skip printing of objects that don't have strtabs.

	Sparc 32 merge:

	* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
	(fixup): Simplify code.  Use ELF_FIXUP_RETURN_VALUE.
	(profile_fixup): Likewise, though this still needs fixing for
	Sparc32 and PPC.
	* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
	to ELF_FIXUP_RETURN_VALUE.

	* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
	Fix up _dl_start_user to handle _dl_skip_args properly.
	Use _dl_hwcap to determine if "flush" is available/needed.

	* sysdeps/sparc/configure.in: Remove.  It doesn't actually do
	anything anymore, and what it did do is done somewhere else.
	* sysdeps/sparc/configure: Likewise.

	* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.

	* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.

	* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
	in divrem expansions.

	* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
	definitions for assembly syntax differences.

	* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
	"system".  Use %g2,%g3 instead.  Use new local label macro.
	* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
	and LOC for proper assembly headers/footers.
	* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
	* sysdeps/sparc/sparc32/alloca.S: Likewise.
	* sysdeps/sparc/sparc32/dotmul.S: Likewise.
	* sysdeps/sparc/sparc32/lshift.S: Likewise.
	* sysdeps/sparc/sparc32/mul_1.S: Likewise.
	* sysdeps/sparc/sparc32/rshift.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
	* sysdeps/sparc/sparc32/sub_n.S: Likewise.
	* sysdeps/sparc/sparc32/submul_1.S: Likewise.
	* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
	* sysdeps/sparc/sparc32/umul.S: Likewise.
	* sysdeps/sparc/sparc32/divrem.m4: Likewise.
	* sysdeps/sparc/sparc32/rem.S: Regenerate.
	* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
	* sysdeps/sparc/sparc32/udiv.S: Regenerate.
	* sysdeps/sparc/sparc32/urem.S: Regenerate.

	* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.

	* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
	* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
	* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.

	* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
	Clean up PIC code.

	* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
	from the sparc64 version.
	* sysdeps/sparc/sparc32/elf/start.c: Removed.

	* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
	assembly based on the sparc64 version.

	* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh.  Use proper syntax
	for manipulating %fsr.
	* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
	be the default.

	* elf/elf.h (HWCAP_SPARC_*): New definitions.
	* elf/rtld.c (_dl_hwcap): New variable.
	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.

	* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
	Attempt to get hold of the page size based on what we might have
	been told at startup time in _dl_pagesize.  This will be obsolete
	when I finish the kernel hooks for a proper sysconf(), stay tuned.

	Sparc 64 merge:

	* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
	Figure out the right thing to return based on the .plt format.

	* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.

	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
	Should have been 64-bits wide.

	* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
	optimize for branch delay slot usage.

1997-08-22  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
	change.

1997-08-20  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* math/libm-test.c (identities): Change epsilon.

	* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
	fabsf, fabsl, __fabsl.

	* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
	* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
Diffstat (limited to 'elf/dl-deps.c')
-rw-r--r--elf/dl-deps.c241
1 files changed, 127 insertions, 114 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 3fbb3dbf92..38db7677b0 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -28,6 +28,10 @@
    is signaled by the AUXTAG entry in l_info.  */
 #define AUXTAG	(DT_NUM + DT_PROCNUM + DT_VERSIONTAGNUM \
 		 + DT_EXTRATAGIDX (DT_AUXILIARY))
+/* Whether an shared object references one or more auxiliary objects
+   is signaled by the AUXTAG entry in l_info.  */
+#define FILTERTAG (DT_NUM + DT_PROCNUM + DT_VERSIONTAGNUM \
+		   + DT_EXTRATAGIDX (DT_FILTER))
 
 
 /* When loading auxiliary objects we must ignore errors.  It's ok if
@@ -138,7 +142,7 @@ _dl_map_object_deps (struct link_map *map,
     {
       struct link_map *l = runp->map;
 
-      if (l->l_info[AUXTAG] || l->l_info[DT_NEEDED])
+      if (l->l_info[AUXTAG] || l->l_info[FILTERTAG] || l->l_info[DT_NEEDED])
 	{
 	  const char *strtab = ((void *) l->l_addr
 				+ l->l_info[DT_STRTAB]->d_un.d_ptr);
@@ -190,119 +194,87 @@ _dl_map_object_deps (struct link_map *map,
 		    dep->l_reserved = 1;
 		  }
 	      }
-	    else if (d->d_tag == DT_AUXILIARY)
+	    else if (d->d_tag == DT_AUXILIARY || d->d_tag == DT_FILTER)
 	      {
 		char *errstring;
 		const char *objname;
+		struct list *newp;
 
-		/* Store the tag in the argument structure.  */
-		args.d = d;
-
-		if (_dl_catch_error (&errstring, &objname, openaux, &args))
+		if (d->d_tag == DT_AUXILIARY)
 		  {
-		    /* We are not interested in the error message.  */
-		    assert (errstring != NULL);
-		    free (errstring);
+		    /* Store the tag in the argument structure.  */
+		    args.d = d;
+
+		    /* We must be prepared that the addressed shared
+		       object is not available.  */
+		    if (_dl_catch_error (&errstring, &objname, openaux, &args))
+		      {
+			/* We are not interested in the error message.  */
+			assert (errstring != NULL);
+			free (errstring);
+
+			/* Simply ignore this error and continue the work.  */
+			continue;
+		      }
 		  }
 		else
+		  /* For filter objects the dependency must be available.  */
+		  args.aux = _dl_map_object (l, strtab + d->d_un.d_val,
+					     (l->l_type == lt_executable
+					      ? lt_library : l->l_type),
+					     trace_mode);
+
+		/* The auxiliary object is actually available.
+		   Incorporate the map in all the lists.  */
+
+		/* Allocate new entry.  This always has to be done.  */
+		newp = alloca (sizeof (struct list));
+
+		/* Copy the content of the current entry over.  */
+		memcpy (newp, orig, sizeof (*newp));
+
+		/* Initialize new entry.  */
+		orig->done = 0;
+		orig->map = args.aux;
+		orig->dup = newp;
+
+		/* We must handle two situations here: the map is new,
+		   so we must add it in all three lists.  If the map
+		   is already known, we have two further possibilities:
+		   - if the object is before the current map in the
+		   search list, we do nothing.  It is already found
+		   early
+		   - if the object is after the current one, we must
+		   move it just before the current map to make sure
+		   the symbols are found early enough
+		*/
+		if (args.aux->l_reserved)
 		  {
-		    /* The auxiliary object is actually available.
-		       Incorporate the map in all the lists.  */
-
-		    /* Allocate new entry.  This always has to be done.  */
-		    struct list *newp = alloca (sizeof (struct list));
-
-		    /* Copy the content of the current entry over.  */
-		    memcpy (newp, orig, sizeof (*newp));
-
-		    /* Initialize new entry.  */
-		    orig->done = 0;
-		    orig->map = args.aux;
-		    orig->dup = newp;
-
-		    /* We must handle two situations here: the map is new,
-		       so we must add it in all three lists.  If the map
-		       is already known, we have two further possibilities:
-		       - if the object is before the current map in the
-		         search list, we do nothing.  It is already found
-			 early
-		       - if the object is after the current one, we must
-		         move it just before the current map to make sure
-			 the symbols are found early enough
-		    */
-		    if (args.aux->l_reserved)
-		      {
-			/* The object is already somewhere in the
-			   list.  Locate it first.  */
-			struct list *late;
-
-			/* This object is already in the search list
-			   we are building.  Don't add a duplicate
-			   pointer.  Release the reference just added
-			   by _dl_map_object.  */
-			--args.aux->l_opencount;
-
-			for (late = orig; late->unique; late = late->unique)
-			  if (late->unique->map == args.aux)
-			    break;
-
-			if (late->unique)
-			  {
-			    /* The object is somewhere behind the current
-			       position in the search path.  We have to
-			       move it to this earlier position.  */
-			    orig->unique = newp;
-
-			    /* Now remove the later entry from the unique
-			       list.  */
-			    late->unique = late->unique->unique;
-
-			    /* We must move the earlier in the chain.  */
-			    if (args.aux->l_prev)
-			      args.aux->l_prev->l_next = args.aux->l_next;
-			    if (args.aux->l_next)
-			      args.aux->l_next->l_prev = args.aux->l_prev;
-
-			    args.aux->l_prev = newp->map->l_prev;
-			    newp->map->l_prev = args.aux;
-			    if (args.aux->l_prev != NULL)
-			      args.aux->l_prev->l_next = args.aux;
-			    args.aux->l_next = newp->map;
-			  }
-			else
-			  {
-			    /* The object must be somewhere earlier in
-			       the list.  That's good, we only have to
-			       insert an entry for the duplicate list.  */
-			    orig->unique = NULL;	/* Never used.  */
-
-			    /* Now we have a problem.  The element pointing
-			       to ORIG in the unique list must point to
-			       NEWP now.  This is the only place where we
-			       need this backreference and this situation
-			       is really not that frequent.  So we don't
-			       use a double-linked list but instead search
-			       for the preceding element.  */
-			    late = head;
-			    while (late->unique != orig)
-			      late = late->unique;
-			    late->unique = newp;
-			  }
-		      }
-		    else
+		    /* The object is already somewhere in the list.
+		       Locate it first.  */
+		    struct list *late;
+
+		    /* This object is already in the search list we
+		       are building.  Don't add a duplicate pointer.
+		       Release the reference just added by
+		       _dl_map_object.  */
+		    --args.aux->l_opencount;
+
+		    for (late = orig; late->unique; late = late->unique)
+		      if (late->unique->map == args.aux)
+			break;
+
+		    if (late->unique)
 		      {
-			/* This is easy.  We just add the symbol right
-			   here.  */
+			/* The object is somewhere behind the current
+			   position in the search path.  We have to
+			   move it to this earlier position.  */
 			orig->unique = newp;
-			++nlist;
-			/* Set the mark bit that says it's already in
-			   the list.  */
-			args.aux->l_reserved = 1;
-
-			/* The only problem is that in the double linked
-			   list of all objects we don't have this new
-			   object at the correct place.  Correct this
-			   here.  */
+
+			/* Now remove the later entry from the unique list.  */
+			late->unique = late->unique->unique;
+
+			/* We must move the earlier in the chain.  */
 			if (args.aux->l_prev)
 			  args.aux->l_prev->l_next = args.aux->l_next;
 			if (args.aux->l_next)
@@ -314,19 +286,60 @@ _dl_map_object_deps (struct link_map *map,
 			  args.aux->l_prev->l_next = args.aux;
 			args.aux->l_next = newp->map;
 		      }
+		    else
+		      {
+			/* The object must be somewhere earlier in the
+			   list.  That's good, we only have to insert
+			   an entry for the duplicate list.  */
+			orig->unique = NULL;	/* Never used.  */
+
+			/* Now we have a problem.  The element
+			   pointing to ORIG in the unique list must
+			   point to NEWP now.  This is the only place
+			   where we need this backreference and this
+			   situation is really not that frequent.  So
+			   we don't use a double-linked list but
+			   instead search for the preceding element.  */
+			late = head;
+			while (late->unique != orig)
+			  late = late->unique;
+			late->unique = newp;
+		      }
+		  }
+		else
+		  {
+		    /* This is easy.  We just add the symbol right here.  */
+		    orig->unique = newp;
+		    ++nlist;
+		    /* Set the mark bit that says it's already in the list.  */
+		    args.aux->l_reserved = 1;
+
+		    /* The only problem is that in the double linked
+		       list of all objects we don't have this new
+		       object at the correct place.  Correct this here.  */
+		    if (args.aux->l_prev)
+		      args.aux->l_prev->l_next = args.aux->l_next;
+		    if (args.aux->l_next)
+		      args.aux->l_next->l_prev = args.aux->l_prev;
+
+		    args.aux->l_prev = newp->map->l_prev;
+		    newp->map->l_prev = args.aux;
+		    if (args.aux->l_prev != NULL)
+		      args.aux->l_prev->l_next = args.aux;
+		    args.aux->l_next = newp->map;
+		  }
 
-		    /* Move the tail pointers if necessary.  */
-		    if (orig == utail)
-		      utail = newp;
-		    if (orig == dtail)
-		      dtail = newp;
+		/* Move the tail pointers if necessary.  */
+		if (orig == utail)
+		  utail = newp;
+		if (orig == dtail)
+		  dtail = newp;
 
-		    /* Move on the insert point.  */
-		    orig = newp;
+		/* Move on the insert point.  */
+		orig = newp;
 
-		    /* We always add an entry to the duplicate list.  */
-		    ++nduplist;
-		  }
+		/* We always add an entry to the duplicate list.  */
+		++nduplist;
 	      }
 	}
       else