From 7e36861e77d7edde557ebf1172271e922c9a51ff Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 11 Jan 2001 19:42:21 +0000 Subject: Update. 2001-01-11 H.J. Lu * elf/dl-libc.c (do_dlopen): Move DL_STATIC_INIT to ... * elf/dl-open.c (_dl_open): Here. * sysdeps/unix/sysv/linux/ia64/dl-static.c (_dl_static_lock): Make it static. (_dl_static_init): Initialize the variables every time when possible. * sysdeps/unix/sysv/linux/ia64/ldsodefs.h (DL_STATIC_INIT): Undefine it first. --- elf/dl-libc.c | 4 ---- elf/dl-open.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'elf') diff --git a/elf/dl-libc.c b/elf/dl-libc.c index 913a516..93ee9b7 100644 --- a/elf/dl-libc.c +++ b/elf/dl-libc.c @@ -76,10 +76,6 @@ do_dlopen (void *ptr) struct do_dlopen_args *args = (struct do_dlopen_args *) ptr; /* Open and relocate the shared object. */ args->map = _dl_open (args->name, RTLD_LAZY, NULL); - -#ifndef SHARED - DL_STATIC_INIT (args->map); -#endif } static void diff --git a/elf/dl-open.c b/elf/dl-open.c index 0170d1c..b8d28f8 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -430,6 +430,10 @@ _dl_open (const char *file, int mode, const void *caller) _dl_signal_error (errcode, objname, local_errstring); } +#ifndef SHARED + DL_STATIC_INIT (args.map); +#endif + return args.map; } -- cgit v1.1