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:18:25 +0200 |
| commit | a8841e00d605bf437dd53223e798744bd831126f (patch) | |
| tree | 176ba8ece9b9587d16dc88eaf6b6811fc58097f0 /nptl | |
| parent | e8a9597159168db43289da50433af0ba3d8a7f92 (diff) | |
| download | glibc-a8841e00d605bf437dd53223e798744bd831126f.tar.gz glibc-a8841e00d605bf437dd53223e798744bd831126f.tar.xz glibc-a8841e00d605bf437dd53223e798744bd831126f.zip | |
nptl: Move pthread_rwlockattr_destroy into libc
The symbol was 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')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 3 | ||||
| -rw-r--r-- | nptl/pthread_rwlockattr_destroy.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index a451f00dd2..97d62044c4 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -131,6 +131,7 @@ routines = \ pthread_rwlock_trywrlock \ pthread_rwlock_unlock \ pthread_rwlock_wrlock \ + pthread_rwlockattr_destroy \ pthread_self \ pthread_setcancelstate \ pthread_setcanceltype \ @@ -186,7 +187,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_rwlockattr_destroy \ pthread_rwlockattr_getkind_np \ pthread_rwlockattr_getpshared \ pthread_rwlockattr_init \ diff --git a/nptl/Versions b/nptl/Versions index 3e494060be..86cb6267bf 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -73,6 +73,7 @@ libc { pthread_rwlock_trywrlock; pthread_rwlock_unlock; pthread_rwlock_wrlock; + pthread_rwlockattr_destroy; } GLIBC_2.2 { __pthread_rwlock_destroy; @@ -226,6 +227,7 @@ libc { pthread_rwlock_trywrlock; pthread_rwlock_unlock; pthread_rwlock_wrlock; + pthread_rwlockattr_destroy; pthread_setspecific; pthread_spin_destroy; pthread_spin_init; @@ -312,7 +314,6 @@ libpthread { pthread_attr_setstacksize; pthread_create; pthread_getconcurrency; - pthread_rwlockattr_destroy; pthread_rwlockattr_getkind_np; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; diff --git a/nptl/pthread_rwlockattr_destroy.c b/nptl/pthread_rwlockattr_destroy.c index fefe022760..3ed19f8ac7 100644 --- a/nptl/pthread_rwlockattr_destroy.c +++ b/nptl/pthread_rwlockattr_destroy.c @@ -17,12 +17,19 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr) +__pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr) { /* Nothing to do. For now. */ return 0; } +versioned_symbol (libc, __pthread_rwlockattr_destroy, + pthread_rwlockattr_destroy, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_rwlockattr_destroy, + pthread_rwlockattr_destroy, GLIBC_2_1); +#endif |