aboutsummaryrefslogtreecommitdiff
path: root/elf/dlopen.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-05-05 23:29:18 +0000
committerUlrich Drepper <drepper@redhat.com>1999-05-05 23:29:18 +0000
commitdc5efe83c0252ad45337ab98eff6c26fdb29b0a9 (patch)
treed7045a782818d82ee49fc8503df674026e1b0588 /elf/dlopen.c
parent4f8dbcb126883c92d33d49c86365a1fb1e54696a (diff)
downloadglibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar
glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar.gz
glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar.bz2
glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.zip
Update.
* Versions.def (ld.so): Add GLIBC_2.1.1. * elf/Makefile (routines): Add dl-origin. (tests): Add origtest. Add dependencies for the program. * elf/Versions (ld.so) [GLIBC_2.1.1]: Add _dl_origin_path, _dl_platformlen, _dl_dst_count and _dl_dst_substitute. * elf/dl-deps.c (expand_dst): New macro. Expand DSTs in filename. (_dl_map_object_deps): Use expand_dst to expand DSTs in DT_NEEDED, DT_AUXILIARY, and DT_FILTER filenames. * elf/dl-load.c (expand_dynamic_string_token): Explode into two functions and three macros. (_dl_dst_count, _dl_dst_substitute): New functions. * elf/dl-dst.h: New file. * elf/dl-open.c (_dl_open): Take extra parameter with address of caller. Pass address in args structure. (dl_open_worker): Recognize and expand DSTs in filename. * elf/ldsodefs.h (_dl_open): Adapt prototype. * elf/dlopen.c (dlopen_doit): Pass caller address to _dl_open. (__dlopen_check): Pass caller address to dlopen_doit in args. * elf/dlopendoit.c: Likewise. * iconv/gconv_dl.c: Adapt call of _dl_open. * nss/nsswitch.c: Likewise. * elf/origtest.c: New file. * sysdeps/generic/dl-origin.h: Moved to... * sysdeps/generic/dl-origin.c: ...here. * sysdeps/unix/sysv/linux/dl-origin.h: Moved to... * sysdeps/unix/sysv/linux/dl-origin.c: ...here.
Diffstat (limited to 'elf/dlopen.c')
-rw-r--r--elf/dlopen.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/elf/dlopen.c b/elf/dlopen.c
index 496fc7d386..b72300df5c 100644
--- a/elf/dlopen.c
+++ b/elf/dlopen.c
@@ -1,5 +1,5 @@
/* Load a shared object at run time.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 1999 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
@@ -28,6 +28,8 @@ struct dlopen_args
int mode;
/* The return value of dlopen_doit. */
struct link_map *new;
+ /* Address of the caller. */
+ const void *caller;
};
@@ -36,7 +38,7 @@ dlopen_doit (void *a)
{
struct dlopen_args *args = (struct dlopen_args *) a;
- args->new = _dl_open (args->file ?: "", args->mode);
+ args->new = _dl_open (args->file ?: "", args->mode, args->caller);
}
@@ -46,6 +48,7 @@ __dlopen_check (const char *file, int mode)
struct dlopen_args args;
args.file = file;
args.mode = mode;
+ args.caller = __builtin_return_address (0);
return _dlerror_run (dlopen_doit, &args) ? NULL : args.new;
}