diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 09:10:57 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 09:17:36 +0200 |
| commit | 504ac633b0213b917a17a4aa98766154a1141925 (patch) | |
| tree | c4934ce48a1b7786f603718c76885fdc036ec1cd /sysdeps/nptl | |
| parent | 2cf5b43bcb392af5f056250560d5711b8ba802c4 (diff) | |
| download | glibc-504ac633b0213b917a17a4aa98766154a1141925.zip glibc-504ac633b0213b917a17a4aa98766154a1141925.tar.gz glibc-504ac633b0213b917a17a4aa98766154a1141925.tar.bz2 | |
nptl: Move pthread_rwlock_destroy into libc
And __pthread_rwlock_destroy as a compatibility symbol.
rwlocks do not need finalization, so change __libc_rwlock_fini to do
nothing.
The symbols were moved using scripts/move-symbol-to-libc.py.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/nptl')
| -rw-r--r-- | sysdeps/nptl/libc-lockP.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h index 239bd5e..dbfba1e 100644 --- a/sysdeps/nptl/libc-lockP.h +++ b/sysdeps/nptl/libc-lockP.h @@ -131,12 +131,7 @@ _Static_assert (LLL_LOCK_INITIALIZER == 0, "LLL_LOCK_INITIALIZER != 0"); #else # define __libc_lock_fini(NAME) __pthread_mutex_destroy (&(NAME)) #endif -#if defined SHARED && IS_IN (libc) -# define __libc_rwlock_fini(NAME) ((void) 0) -#else -# define __libc_rwlock_fini(NAME) \ - __libc_maybe_call (__pthread_rwlock_destroy, (&(NAME)), 0) -#endif +#define __libc_rwlock_fini(NAME) ((void) 0) /* Lock the named lock variable. */ #if IS_IN (libc) || IS_IN (libpthread) @@ -305,7 +300,6 @@ libc_hidden_proto (__pthread_setcancelstate) weak_extern (__pthread_mutex_trylock) weak_extern (__pthread_mutexattr_destroy) weak_extern (__pthread_rwlock_init) -weak_extern (__pthread_rwlock_destroy) weak_extern (__pthread_rwlock_tryrdlock) weak_extern (__pthread_rwlock_trywrlock) weak_extern (__pthread_initialize) @@ -313,7 +307,6 @@ weak_extern (__pthread_atfork) # else # pragma weak __pthread_mutex_trylock # pragma weak __pthread_mutexattr_destroy -# pragma weak __pthread_rwlock_destroy # pragma weak __pthread_rwlock_tryrdlock # pragma weak __pthread_rwlock_trywrlock # pragma weak __pthread_initialize |