diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-12-06 11:49:42 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-12-06 11:49:42 +0000 |
| commit | d3c9f895257e50335e874ca08ad6efcc0abea6d7 (patch) | |
| tree | 2609eac2bef305ae9e69f0f3e458882030cd83dc /sysdeps/generic | |
| parent | d5ddad4ff48cc7887281259dacf5ac455d5a9dd8 (diff) | |
| download | glibc-d3c9f895257e50335e874ca08ad6efcc0abea6d7.tar.gz glibc-d3c9f895257e50335e874ca08ad6efcc0abea6d7.tar.xz glibc-d3c9f895257e50335e874ca08ad6efcc0abea6d7.zip | |
Update.
2002-12-06 Ulrich Drepper <drepper@redhat.com> * misc/syslog.c (log_cleanup): New function. (openlog): Use log_cleanup instead of __libc_mutex_unlock. (closelog): Likewise. * elf/dl-close.c: Use __rtld_lock_* macros instead of __libc_lock_*. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-misc.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/rtld.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/bits/libc-lock.h: Define __rtld_lock_* macros. * sysdeps/mach/bits/libc-lock.h: Likewise. * sysdeps/mach/hurd/bits/libc-lock.h: Likewise. * dirent/bug-readdir1.c (main): Don't call closedir, just close
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/bits/libc-lock.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sysdeps/generic/bits/libc-lock.h b/sysdeps/generic/bits/libc-lock.h index ff808904a8..c2bb494940 100644 --- a/sysdeps/generic/bits/libc-lock.h +++ b/sysdeps/generic/bits/libc-lock.h @@ -30,6 +30,7 @@ of libc. */ #define __libc_lock_define(CLASS,NAME) #define __libc_lock_define_recursive(CLASS,NAME) +#define __rtld_lock_define_recursive(CLASS,NAME) #define __libc_rwlock_define(CLASS,NAME) /* Define an initialized lock variable NAME with storage class CLASS. */ @@ -47,6 +48,7 @@ /* Same as last but this time we initialize a recursive mutex. */ #define __libc_lock_init_recursive(NAME) +#define __rtld_lock_init_recursive(NAME) /* Finalize the named lock variable, which must be locked. It cannot be used again until __libc_lock_init is called again on it. This must be @@ -64,6 +66,7 @@ /* Lock the recursive named lock variable. */ #define __libc_lock_lock_recursive(NAME) +#define __rtld_lock_lock_recursive(NAME) /* Try to lock the named lock variable. */ #define __libc_lock_trylock(NAME) 0 @@ -79,6 +82,7 @@ /* Unlock the recursive named lock variable. */ #define __libc_lock_unlock_recursive(NAME) +#define __rtld_lock_unlock_recursive(NAME) /* Define once control variable. */ diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 5e08844ce3..a704644d6e 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -250,7 +250,7 @@ struct rtld_global 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_recursive (EXTERN, _dl_load_lock) + __rtld_lock_define_recursive (EXTERN, _dl_load_lock) /* OS version. */ EXTERN unsigned int _dl_osversion; |