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 /nptl/pthread_rwlock_destroy.c | |
| parent | 2cf5b43bcb392af5f056250560d5711b8ba802c4 (diff) | |
| download | glibc-504ac633b0213b917a17a4aa98766154a1141925.tar.gz glibc-504ac633b0213b917a17a4aa98766154a1141925.tar.xz glibc-504ac633b0213b917a17a4aa98766154a1141925.zip | |
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 'nptl/pthread_rwlock_destroy.c')
| -rw-r--r-- | nptl/pthread_rwlock_destroy.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nptl/pthread_rwlock_destroy.c b/nptl/pthread_rwlock_destroy.c index 27725697f7..ebedf298b9 100644 --- a/nptl/pthread_rwlock_destroy.c +++ b/nptl/pthread_rwlock_destroy.c @@ -18,14 +18,24 @@ #include "pthreadP.h" #include <stap-probe.h> - +#include <shlib-compat.h> int -__pthread_rwlock_destroy (pthread_rwlock_t *rwlock) +___pthread_rwlock_destroy (pthread_rwlock_t *rwlock) { LIBC_PROBE (rwlock_destroy, 1, rwlock); /* Nothing to be done. For now. */ return 0; } -strong_alias (__pthread_rwlock_destroy, pthread_rwlock_destroy) +versioned_symbol (libc, ___pthread_rwlock_destroy, pthread_rwlock_destroy, + GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_destroy, pthread_rwlock_destroy, + GLIBC_2_1); +#endif +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_destroy, __pthread_rwlock_destroy, + GLIBC_2_2); +#endif |