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/mach | |
| 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/mach')
| -rw-r--r-- | sysdeps/mach/bits/libc-lock.h | 9 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/libc-lock.h | 20 |
2 files changed, 27 insertions, 2 deletions
diff --git a/sysdeps/mach/bits/libc-lock.h b/sysdeps/mach/bits/libc-lock.h index 2484297c8a..76bbd02d0d 100644 --- a/sysdeps/mach/bits/libc-lock.h +++ b/sysdeps/mach/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. Mach cthreads version. - Copyright (C) 1996,97,98,2000,01 Free Software Foundation, Inc. + Copyright (C) 1996,97,98,2000,01, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -134,4 +134,11 @@ void *__libc_getspecific (__libc_key_t key); #define __libc_lock_unlock_recursive __libc_lock_unlock #define __libc_lock_lock_recursive __libc_lock_lock +#define __rtld_lock_define_initialized_recursive __libc_lock_define_initialized +#define __rtld_lock_init_recursive __libc_lock_init +#define __rtld_lock_fini_recursive __libc_lock_fini +#define __rtld_lock_trylock_recursive __libc_lock_trylock +#define __rtld_lock_unlock_recursive __libc_lock_unlock +#define __rtld_lock_lock_recursive __libc_lock_lock + #endif /* bits/libc-lock.h */ diff --git a/sysdeps/mach/hurd/bits/libc-lock.h b/sysdeps/mach/hurd/bits/libc-lock.h index 6e3835371c..bc83eafc49 100644 --- a/sysdeps/mach/hurd/bits/libc-lock.h +++ b/sysdeps/mach/hurd/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. Hurd version using Mach cthreads. - Copyright (C) 1996,97,98,2000,01 Free Software Foundation, Inc. + Copyright (C) 1996,97,98,2000,01, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -62,6 +62,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; called on a lock variable before the containing storage is reused. */ #define __libc_lock_fini(NAME) __mutex_unlock (&(NAME)) #define __libc_lock_fini_recursive(NAME) __mutex_unlock (&(NAME).mutex) +#define __rtld_lock_fini_recursive(NAME) __mutex_unlock (&(NAME).mutex) /* Lock the named lock variable. */ @@ -80,6 +81,13 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #define __libc_lock_define_initialized_recursive(CLASS,NAME) \ CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER; +#define __rtld_lock_define_recursive(CLASS,NAME) \ + __libc_lock_define_recursive (CLASS, NAME) +#define _RTLD_LOCK_RECURSIVE_INITIALIZER \ + _LIBC_LOCK_RECURSIVE_INITIALIZER +#define __rtld_lock_define_initialized_recursive(CLASS,NAME) \ + __libc_lock_define_initialized_recursive (CLASS, NAME) + #define __libc_lock_init_recursive(NAME) \ ({ __libc_lock_recursive_t *const __lock = &(NAME); \ __lock->owner = 0; mutex_init (&__lock->mutex); }) @@ -111,6 +119,16 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; }) +#define __rtld_lock_init_recursive(NAME) \ + __libc_lock_init_recursive (NAME) +#define __rtld_lock_trylock_recursive(NAME) \ + __libc_lock_trylock_recursive (NAME) +#define __rtld_lock_lock_recursive(NAME) \ + __libc_lock_lock_recursive(NAME) +#define __rtld_lock_unlock_recursive(NAME) \ + __libc_lock_unlock_recursive (NAME) + + /* XXX for now */ #define __libc_rwlock_define __libc_lock_define #define __libc_rwlock_define_initialized __libc_lock_define_initialized |