diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-03-29 17:32:35 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-03-29 17:32:35 +0000 |
commit | 993b3242cdc37152fbbc7fbd5ce22b2734b04b23 (patch) | |
tree | d3c4fc94e027728055d96a370d034b6fb685cf85 /elf/rtld.c | |
parent | e7fd8a39abd3a9c9d2139e686b17efb5dc3bf444 (diff) | |
download | glibc-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/rtld.c')
-rw-r--r-- | elf/rtld.c | 80 |
1 files changed, 62 insertions, 18 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index d6bd516dfc..6f9737e060 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -140,6 +140,55 @@ _dl_start (void *arg) void _start (void); +/* Some helper functions. */ + +/* Arguments to relocate_doit. */ +struct relocate_args +{ + struct link_map *l; + int lazy; +}; + +struct map_args +{ + /* Argument to map_doit. */ + char *str; + /* Return value of map_doit. */ + struct link_map *main_map; +}; + +/* Arguments to version_check_doit. */ +struct version_check_args +{ + struct link_map *main_map; + int doexit; +}; + +static void +relocate_doit (void *a) +{ + struct relocate_args *args = (struct relocate_args *) a; + + _dl_relocate_object (args->l, _dl_object_relocation_scope (args->l), + args->lazy); +} + +static void +map_doit (void *a) +{ + struct map_args *args = (struct map_args *)a; + args->main_map = _dl_map_object (NULL, args->str, lt_library, 0); +} + +static void +version_check_doit (void *a) +{ + struct version_check_args *args = (struct version_check_args *)a; + if (_dl_check_all_versions (args->main_map, 1) && args->doexit) + /* We cannot start the application. Abort now. */ + _exit (1); +} + unsigned int _dl_skip_args; /* Nonzero if we were run directly. */ static void @@ -234,14 +283,13 @@ of this helper program; chances are you did not intend to run this program.\n", if (mode == verify) { - void doit (void) - { - main_map = _dl_map_object (NULL, _dl_argv[0], lt_library, 0); - } char *err_str = NULL; const char *obj_name __attribute__ ((unused)); + struct map_args args; - (void) _dl_catch_error (&err_str, &obj_name, doit); + args.str = _dl_argv[0]; + (void) _dl_catch_error (&err_str, &obj_name, map_doit, &args); + main_map = args.main_map; if (err_str != NULL) { free (err_str); @@ -469,14 +517,10 @@ of this helper program; chances are you did not intend to run this program.\n", /* Now let us see whether all libraries are available in the versions we need. */ { - void doit (void) - { - if (_dl_check_all_versions (main_map, 1) && mode == normal) - /* We cannot start the application. Abort now. */ - _exit (1); - } - - _dl_receive_error (print_missing_version, doit); + struct version_check_args args; + args.doexit = mode == normal; + args.main_map = main_map; + _dl_receive_error (print_missing_version, version_check_doit, &args); } if (mode != normal) @@ -535,11 +579,10 @@ of this helper program; chances are you did not intend to run this program.\n", else if (lazy >= 0) { /* We have to do symbol dependency testing. */ + struct relocate_args args; struct link_map *l; - void doit (void) - { - _dl_relocate_object (l, _dl_object_relocation_scope (l), lazy); - } + + args.lazy = lazy; l = _dl_loaded; while (l->l_next) @@ -548,7 +591,8 @@ of this helper program; chances are you did not intend to run this program.\n", { if (l != &_dl_rtld_map && l->l_opencount > 0) { - _dl_receive_error (print_unresolved, doit); + args.l = l; + _dl_receive_error (print_unresolved, relocate_doit, &args); *_dl_global_scope_end = NULL; } l = l->l_prev; |