* sysdeps/generic/ldsodefs.h (_dl_load_lock): Declare it here with

	__libc_lock_define_recursive.
	* elf/dl-open.c: Don't declare it here any more.
	* elf/dl-close.c: Likewise.
	* elf/dl-lookup.c: Likewise.
	* elf/dl-iteratephdr.c: Likewise.
	* elf/dl-lookup.c (add_dependency): Use __libc_lock_lock_recursive and
	__libc_lock_unlock_recursive.
	* elf/dl-close.c (_dl_close): Likewise
	* elf/dl-iteratephdr.c (__dl_iterate_phdr): Likewise
	* elf/dl-open.c (_dl_open): Likewise

	* sysdeps/generic/bits/libc-lock.h
	(__libc_lock_define_recursive): New macro.
	* sysdeps/generic/bits/stdio-lock.h (_IO_lock_t): Use it.
	(_IO_lock_lock): Use __libc_lock_lock_recursive.
	(_IO_lock_unlock): Use __libc_lock_unlock_recursive.

1 files changed, 3 insertions, 8 deletions

diff --git a/elf/dl-close.c b/elf/dl-close.c
index 3d24892d28..66c88b2641 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -32,11 +32,6 @@
 typedef void (*fini_t) (void);
 
 
-/* During the program run we must not modify the global data of
-   loaded shared object simultanously in two threads.  Therefore we
-   protect `dlopen' and `dlclose' in dlclose.c.  */
-__libc_lock_define (extern, _dl_load_lock)
-
 void
 internal_function
 _dl_close (void *_map)
@@ -61,7 +56,7 @@ _dl_close (void *_map)
     _dl_signal_error (0, map->l_name, N_("shared object not open"));
 
   /* Acquire the lock.  */
-  __libc_lock_lock (_dl_load_lock);
+  __libc_lock_lock_recursive (_dl_load_lock);
 
   /* Decrement the reference count.  */
   if (map->l_opencount > 1 || map->l_type != lt_loaded)
@@ -80,7 +75,7 @@ _dl_close (void *_map)
       /* One decrement the object itself, not the dependencies.  */
       --map->l_opencount;
 
-      __libc_lock_unlock (_dl_load_lock);
+      __libc_lock_unlock_recursive (_dl_load_lock);
       return;
     }
 
@@ -277,7 +272,7 @@ _dl_close (void *_map)
   free (list);
 
   /* Release the lock.  */
-  __libc_lock_unlock (_dl_load_lock);
+  __libc_lock_unlock_recursive (_dl_load_lock);
 }