diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-23 06:03:42 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-23 06:03:42 +0000 |
| commit | c12aa8015699d66a193c3c183b4f1d1a72bb92c1 (patch) | |
| tree | a20c1864b74c8471aa7aaf675da180546b16c537 /elf/dl-iteratephdr.c | |
| parent | 8179dcc10808cf2a515cf19d445789193a763ec4 (diff) | |
| download | glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.zip glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.tar.gz glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.tar.bz2 | |
* 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.
Diffstat (limited to 'elf/dl-iteratephdr.c')
| -rw-r--r-- | elf/dl-iteratephdr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c index fa62dc7..ff11ce5 100644 --- a/elf/dl-iteratephdr.c +++ b/elf/dl-iteratephdr.c @@ -23,8 +23,6 @@ #include <stddef.h> #include <bits/libc-lock.h> -__libc_lock_define (extern, _dl_load_lock) - int __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, size_t size, void *data), void *data) @@ -34,7 +32,7 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, int ret = 0; /* Make sure we are alone. */ - __libc_lock_lock (_dl_load_lock); + __libc_lock_lock_recursive (_dl_load_lock); for (l = _dl_loaded; l != NULL; l = l->l_next) { @@ -51,7 +49,7 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, } /* Release the lock. */ - __libc_lock_unlock (_dl_load_lock); + __libc_lock_unlock_recursive (_dl_load_lock); return ret; } |