summary refs log tree commit diff
path: root/elf/dl-open.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-23 07:45:38 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-23 07:45:38 +0000
commit1fc074913b0d1f0d57afb585daa41df47ea1ac31 (patch)
tree9d48f0a3ae6f191dfdf8aee498ace470b5c9a5d7 /elf/dl-open.c
parentbbb5e55c10a1b075089a9e54150010a6f202b567 (diff)
downloadglibc-1fc074913b0d1f0d57afb585daa41df47ea1ac31.tar.gz
glibc-1fc074913b0d1f0d57afb585daa41df47ea1ac31.tar.xz
glibc-1fc074913b0d1f0d57afb585daa41df47ea1ac31.zip
Update.
2004-09-23  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/generic/bits/dlfcn.h: Add RTLD_DEEPBIND.
	* elf/dl-object.c (_dl_new_object): Add new parameter mode.  If mode
	has RTLD_DEEPBIND set add local searchlist before global scope.
	* sysdeps/generic/ldsodefs.h (_dl_new_object): Adjust prototype.
	* elf/rtld.c: Adjust callers of _dl_new_object.
	* elf/dl-load.c: Likewise.
	(_dl_map_object_from_fd): If RTLD_DEEPBIND is used, don't do anything
	for DF_SYMBOLIC.
	* elf/dl-open.c (dl_open_writer): Pass RTLD_DEEPBIND flag on to
	_dl_map_object_deps.
	* elf/tst-deep1.c: New file.
	* elf/tst-deep1mod1.c: New file.
	* elf/tst-deep1mod2.c: New file.
	* elf/tst-deep1mod3.c: New file.
	* elf/Makefile: Add rules to build and run new tests.

	* elf/dl-deps.c: Pretty printing.
Diffstat (limited to 'elf/dl-open.c')
-rw-r--r--elf/dl-open.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c
index c352722e27..c9b4a45596 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -272,7 +272,8 @@ dl_open_worker (void *a)
     }
 
   /* Load that object's dependencies.  */
-  GLRO(dl_map_object_deps) (new, NULL, 0, 0, mode & __RTLD_DLOPEN);
+  GLRO(dl_map_object_deps) (new, NULL, 0, 0,
+			    mode & (__RTLD_DLOPEN | RTLD_DEEPBIND));
 
   /* So far, so good.  Now check the versions.  */
   for (i = 0; i < new->l_searchlist.r_nlist; ++i)