diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-close.c | 6 | ||||
| -rw-r--r-- | elf/dl-iteratephdr.c | 4 | ||||
| -rw-r--r-- | elf/dl-lookup.c | 4 | ||||
| -rw-r--r-- | elf/dl-misc.c | 4 | ||||
| -rw-r--r-- | elf/dl-open.c | 4 | ||||
| -rw-r--r-- | elf/dl-support.c | 2 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c index 0a6265f142..84c10cbf3a 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -126,7 +126,7 @@ _dl_close (void *_map) _dl_signal_error (0, map->l_name, NULL, N_("shared object not open")); /* Acquire the lock. */ - __libc_lock_lock_recursive (GL(dl_load_lock)); + __rtld_lock_lock_recursive (GL(dl_load_lock)); /* Decrement the reference count. */ if (map->l_opencount > 1 || map->l_type != lt_loaded) @@ -139,7 +139,7 @@ _dl_close (void *_map) /* One decrement the object itself, not the dependencies. */ --map->l_opencount; - __libc_lock_unlock_recursive (GL(dl_load_lock)); + __rtld_lock_unlock_recursive (GL(dl_load_lock)); return; } @@ -422,7 +422,7 @@ _dl_close (void *_map) free (list); /* Release the lock. */ - __libc_lock_unlock_recursive (GL(dl_load_lock)); + __rtld_lock_unlock_recursive (GL(dl_load_lock)); } libc_hidden_def (_dl_close) diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c index b80936870a..c374baaa98 100644 --- a/elf/dl-iteratephdr.c +++ b/elf/dl-iteratephdr.c @@ -32,7 +32,7 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, int ret = 0; /* Make sure we are alone. */ - __libc_lock_lock_recursive (GL(dl_load_lock)); + __rtld_lock_lock_recursive (GL(dl_load_lock)); for (l = GL(dl_loaded); l != NULL; l = l->l_next) { @@ -49,7 +49,7 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, } /* Release the lock. */ - __libc_lock_unlock_recursive (GL(dl_load_lock)); + __rtld_lock_unlock_recursive (GL(dl_load_lock)); return ret; } diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 1c3d9b5ad5..39b3a3d013 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -100,7 +100,7 @@ add_dependency (struct link_map *undef_map, struct link_map *map) return 0; /* Make sure nobody can unload the object while we are at it. */ - __libc_lock_lock_recursive (GL(dl_load_lock)); + __rtld_lock_lock_recursive (GL(dl_load_lock)); /* Determine whether UNDEF_MAP already has a reference to MAP. First look in the normal dependencies. */ @@ -186,7 +186,7 @@ add_dependency (struct link_map *undef_map, struct link_map *map) out: /* Release the lock. */ - __libc_lock_unlock_recursive (GL(dl_load_lock)); + __rtld_lock_unlock_recursive (GL(dl_load_lock)); return result; } diff --git a/elf/dl-misc.c b/elf/dl-misc.c index 0fbfcde004..979de9b7ac 100644 --- a/elf/dl-misc.c +++ b/elf/dl-misc.c @@ -258,9 +258,9 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) __writev (fd, iov, niov); else { - __libc_lock_lock_recursive (GL(dl_load_lock)); + __rtld_lock_lock_recursive (GL(dl_load_lock)); __writev (fd, iov, niov); - __libc_lock_unlock_recursive (GL(dl_load_lock)); + __rtld_lock_unlock_recursive (GL(dl_load_lock)); } #else __writev (fd, iov, niov); diff --git a/elf/dl-open.c b/elf/dl-open.c index 7dd18b7d97..65102fabce 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -486,7 +486,7 @@ _dl_open (const char *file, int mode, const void *caller) _dl_signal_error (EINVAL, file, NULL, N_("invalid mode for dlopen()")); /* Make sure we are alone. */ - __libc_lock_lock_recursive (GL(dl_load_lock)); + __rtld_lock_lock_recursive (GL(dl_load_lock)); args.file = file; args.mode = mode; @@ -500,7 +500,7 @@ _dl_open (const char *file, int mode, const void *caller) #endif /* Release the lock. */ - __libc_lock_unlock_recursive (GL(dl_load_lock)); + __rtld_lock_unlock_recursive (GL(dl_load_lock)); if (__builtin_expect (errstring != NULL, 0)) { diff --git a/elf/dl-support.c b/elf/dl-support.c index b4b185fd97..7d56237e1d 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -138,7 +138,7 @@ size_t _dl_phnum; This must be a recursive lock since the initializer function of the loaded object might as well require a call to this function. At this time it is not anymore a problem to modify the tables. */ -__libc_lock_define_initialized_recursive (, _dl_load_lock) +__rtld_lock_define_initialized_recursive (, _dl_load_lock) #ifdef HAVE_AUX_VECTOR diff --git a/elf/rtld.c b/elf/rtld.c index e43a0e998d..a93be8447e 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -102,7 +102,7 @@ struct rtld_global _rtld_global = ._dl_correct_cache_id = _DL_CACHE_DEFAULT_ID, ._dl_hwcap_mask = HWCAP_IMPORTANT, #ifdef _LIBC_REENTRANT - ._dl_load_lock = _LIBC_LOCK_RECURSIVE_INITIALIZER + ._dl_load_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER #endif }; strong_alias (_rtld_global, _rtld_local); |