aboutsummaryrefslogtreecommitdiff
path: root/elf/dlvsym.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-03-29 17:32:35 +0000
committerUlrich Drepper <drepper@redhat.com>1997-03-29 17:32:35 +0000
commit993b3242cdc37152fbbc7fbd5ce22b2734b04b23 (patch)
treed3c4fc94e027728055d96a370d034b6fb685cf85 /elf/dlvsym.c
parente7fd8a39abd3a9c9d2139e686b17efb5dc3bf444 (diff)
downloadglibc-993b3242cdc37152fbbc7fbd5ce22b2734b04b23.tar
glibc-993b3242cdc37152fbbc7fbd5ce22b2734b04b23.tar.gz
glibc-993b3242cdc37152fbbc7fbd5ce22b2734b04b23.tar.bz2
glibc-993b3242cdc37152fbbc7fbd5ce22b2734b04b23.zip
Update.
1997-03-29 17:39 Ulrich Drepper <drepper@cygnus.com> * math/Makefile (routines): Add carg, s_ccosh and s_csinh. * math/complex.h: Add C++ protection. * math/libm-test.c (cexp_test): Correct a few bugs. (csinh_test): New function. (ccosh_test): New function. (cacos_test): New function. (cacosh_test): New function. (casinh_test): New function. (catanh_test): New function. (main): Add calls to csinh_test and ccosh_test. * misc/Makefile (tests): Add tst-tsearch. Add rule to link tst-tsearch against libm. * misc/tsearch.c: Rewritten to use Red-Black-Tree algorithm by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>. * misc/tst-tsearch.c: New file. * stdio-common/bug5.c: Clear LD_LIBRARY_PATH environment variable before using system. * stdio-common/test-popen.c: Clear LD_LIBRARY_PATH environment variable before using popen. * sysdeps/libm-ieee754/s_cexp.c: Correct handling of special cases. * sysdeps/libm-ieee754/s_cexpf.c: Likewise. * sysdeps/libm-ieee754/s_cexpl.c: Likewise. * sysdeps/libm-i387/s_cexp.S: New file. ix87 specific implementation of complex exponential function. * sysdeps/libm-i387/s_cexpf.S: New file. * sysdeps/libm-i387/s_cexpl.S: New file. * sysdeps/libm-ieee754/s_ccosh.c: New file. Implementation of complex cosh function. * sysdeps/libm-ieee754/s_ccoshf.c: New file. * sysdeps/libm-ieee754/s_ccoshl.c: New file. * sysdeps/libm-ieee754/s_csinh.c: New file. Implementation of complex sinh function. * sysdeps/libm-ieee754/s_csinhf.c: New file. * sysdeps/libm-ieee754/s_csinhl.c: New file. * math/carg.c: New file. Generic implementatio of carg function. * math/cargf.c: New file. * math/cargl.c: New file. 1997-03-29 16:07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/system.c: Update copyright. 1997-03-29 04:18 Ulrich Drepper <drepper@cygnus.com> * elf/dl-error.c (_dl_catch_error): Add another argument which is passed to OPERATE. (_dl_receive_error): Likewise. * elf/link.h: Change prototypes for _dl_catch_error and _dl_receive_error to reflect above change. * elf/dl-deps.c: Don't use nested function. Call _dl_catch_error with additional argument with pointer to data. * elf/dlclose.c: Likewise. * elf/dlerror.c: Likewise. * elf/dlopen.c: Likewise. * elf/dlsym.c: Likewise. * elf/dlvsym.c: Likewise. * elf/rtld.c: Likewise. * nss/nsswitch.c: Likewise. Patch by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>. 1997-03-28 21:14 Miguel de Icaza <miguel@nuclecu.unam.mx> * elf/dl-error.c: Manually set up the values of "c", this avoids a call to memcpy and a zero 152 bytes structure. * sysdeps/sparc/dl-machine.h (elf_machine_rela): Test RTLD_BOOTSTRAP to avoid performing relative relocs on a second pass. * sysdeps/sparc/udiv_qrnnd.S: Make the code PIC aware. * sysdeps/unix/sysv/linux/sparc/Dist: Add kernel_stat.h and kernel_sigaction.h Add Linux/SPARC specific definitions. * sysdeps/unix/sysv/linux/sparc/fcntlbits.h: New file. * sysdeps/unix/sysv/linux/sparc/ioctls.h: New file. * sysdeps/unix/sysv/linux/sparc/kernel_sigaction.h: New file. * sysdeps/unix/sysv/linux/sparc/kernel_stat.h: New file. * sysdeps/unix/sysv/linux/sparc/sigaction.h: New file. * sysdeps/unix/sysv/linux/sparc/signum.h: New file. * sysdeps/unix/sysv/linux/sparc/termbits.h: New file. 1997-03-28 13:06 Philip Blundell <pjb27@cam.ac.uk> * sysdeps/posix/getaddrinfo.c (gaih_inet_serv): Use __getservbyname_r() not getservbyname(). (BROKEN_LIKE_POSIX): Define to 1 so we get strict POSIX behaviour.
Diffstat (limited to 'elf/dlvsym.c')
-rw-r--r--elf/dlvsym.c109
1 files changed, 67 insertions, 42 deletions
diff --git a/elf/dlvsym.c b/elf/dlvsym.c
index b3d4c1aeee..ca8e25d9df 100644
--- a/elf/dlvsym.c
+++ b/elf/dlvsym.c
@@ -24,57 +24,82 @@
#include <dl-hash.h>
-void *
-__dlvsym (void *handle, const char *name, const char *version_str)
+struct dlvsym_args
{
- ElfW(Addr) caller = (ElfW(Addr)) __builtin_return_address (0);
- ElfW(Addr) loadbase;
+ /* The arguments to dlvsym_doit. */
+ void *handle;
+ const char *name;
struct r_found_version version;
- const ElfW(Sym) *ref = NULL;
- void doit (void)
+ ElfW(Addr) caller;
+ /* The return values of dlvsym_doit. */
+ ElfW(Addr) loadbase;
+ const ElfW(Sym) *ref;
+};
+
+
+static void
+dlvsym_doit (void *a)
+{
+ struct dlvsym_args *args = (struct dlvsym_args *)a;
+ args->ref = NULL;
+
+ if (args->handle == NULL)
+ /* Search the global scope. */
+ args->loadbase = _dl_lookup_versioned_symbol (args->name, &args->ref,
+ &(_dl_global_scope
+ ?: _dl_default_scope)[2],
+ NULL, &args->version, 0);
+ else if (args->handle == RTLD_NEXT)
{
- if (handle == NULL)
- /* Search the global scope. */
- loadbase = _dl_lookup_versioned_symbol
- (name, &ref, &(_dl_global_scope ?: _dl_default_scope)[2], NULL,
- &version, 0);
- else if (handle == RTLD_NEXT)
- {
- struct link_map *l, *match;
-
- /* Find the highest-addressed object that CALLER is not below. */
- match = NULL;
- for (l = _dl_loaded; l; l = l->l_next)
- if (caller >= l->l_addr && (!match || match->l_addr < l->l_addr))
- match = l;
-
- if (! match)
- _dl_signal_error (0, NULL, _("\
+ struct link_map *l, *match;
+
+ /* Find the highest-addressed object that CALLER is not below. */
+ match = NULL;
+ for (l = _dl_loaded; l; l = l->l_next)
+ if (args->caller >= l->l_addr && (!match || match->l_addr < l->l_addr))
+ match = l;
+
+ if (! match)
+ _dl_signal_error (0, NULL, _("\
RTLD_NEXT used in code not dynamically loaded"));
- l = match;
- while (l->l_loader)
- l = l->l_loader;
-
- loadbase = _dl_lookup_versioned_symbol_skip
- (name, &ref, &_dl_loaded, NULL, &version, l);
- }
- else
- {
- /* Search the scope of the given object. */
- struct link_map *map = handle;
- struct link_map *mapscope[2] = { map, NULL };
- loadbase = _dl_lookup_versioned_symbol
- (name, &ref, mapscope, map->l_name, &version, 0);
- }
+ l = match;
+ while (l->l_loader)
+ l = l->l_loader;
+
+ args->loadbase = _dl_lookup_versioned_symbol_skip (args->name,
+ &args->ref,
+ &_dl_loaded,
+ NULL, &args->version,
+ l);
+ }
+ else
+ {
+ /* Search the scope of the given object. */
+ struct link_map *map = args->handle;
+ struct link_map *mapscope[2] = { map, NULL };
+ args->loadbase = _dl_lookup_versioned_symbol (args->name, &args->ref,
+ mapscope, map->l_name,
+ &args->version, 0);
}
+}
+
+void *
+__dlvsym (void *handle, const char *name, const char *version_str)
+{
+ struct dlvsym_args args;
+
+ args.handle = handle;
+ args.name = name;
+ args.caller = (ElfW(Addr)) __builtin_return_address (0);
/* Compute hash value to the version string. */
- version.name = version_str;
- version.hash = _dl_elf_hash (version_str);
+ args.version.name = version_str;
+ args.version.hash = _dl_elf_hash (version_str);
/* We don't have a specific file where the symbol can be found. */
- version.filename = NULL;
+ args.version.filename = NULL;
- return _dlerror_run (doit) ? NULL : (void *) (loadbase + ref->st_value);
+ return (_dlerror_run (dlvsym_doit, &args)
+ ? NULL : (void *) (args.loadbase + args.ref->st_value));
}
weak_alias (__dlvsym, dlvsym)