summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-11 19:42:21 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-11 19:42:21 +0000
commit7e36861e77d7edde557ebf1172271e922c9a51ff (patch)
tree86c517e9026f21bdea117f9eaf8c1c38c0615f15 /elf
parent3bbddbe4a37ebd5e015fea42065db59966444224 (diff)
downloadglibc-7e36861e77d7edde557ebf1172271e922c9a51ff.tar.gz
glibc-7e36861e77d7edde557ebf1172271e922c9a51ff.tar.xz
glibc-7e36861e77d7edde557ebf1172271e922c9a51ff.zip
Update.
2001-01-11  H.J. Lu  <hjl@gnu.org>

	* 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.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-libc.c4
-rw-r--r--elf/dl-open.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/elf/dl-libc.c b/elf/dl-libc.c
index 913a516f37..93ee9b7736 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 0170d1c0fb..b8d28f826f 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;
 }