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:42 +0200 |
| commit | b444409479e34c80f27742e7017ea5741fe548d7 (patch) | |
| tree | 787d0d884a8be9f3499ded8831763ab9a393507f /nptl | |
| parent | dbfa12e201529d7006477d192a6f340e696744a1 (diff) | |
| download | glibc-b444409479e34c80f27742e7017ea5741fe548d7.tar glibc-b444409479e34c80f27742e7017ea5741fe548d7.tar.gz glibc-b444409479e34c80f27742e7017ea5741fe548d7.tar.bz2 glibc-b444409479e34c80f27742e7017ea5741fe548d7.zip | |
nptl: Move pthread_rwlockattr_setkind_np 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_setkind_np.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index d6920dfb25..757e5e4238 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -135,6 +135,7 @@ routines = \ pthread_rwlockattr_getkind_np \ pthread_rwlockattr_getpshared \ pthread_rwlockattr_init \ + pthread_rwlockattr_setkind_np \ pthread_self \ pthread_setcancelstate \ pthread_setcanceltype \ @@ -190,7 +191,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_rwlockattr_setkind_np \ pthread_rwlockattr_setpshared \ pthread_setaffinity \ pthread_setattr_default_np \ diff --git a/nptl/Versions b/nptl/Versions index bc0a9c826a..450c3727ab 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -77,6 +77,7 @@ libc { pthread_rwlockattr_getkind_np; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; + pthread_rwlockattr_setkind_np; } GLIBC_2.2 { __pthread_rwlock_destroy; @@ -234,6 +235,7 @@ libc { pthread_rwlockattr_getkind_np; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; + pthread_rwlockattr_setkind_np; pthread_setspecific; pthread_spin_destroy; pthread_spin_init; @@ -320,7 +322,6 @@ libpthread { pthread_attr_setstacksize; pthread_create; pthread_getconcurrency; - pthread_rwlockattr_setkind_np; pthread_rwlockattr_setpshared; pthread_setconcurrency; sem_destroy; diff --git a/nptl/pthread_rwlockattr_setkind_np.c b/nptl/pthread_rwlockattr_setkind_np.c index eda7b54bc8..9e13665470 100644 --- a/nptl/pthread_rwlockattr_setkind_np.c +++ b/nptl/pthread_rwlockattr_setkind_np.c @@ -18,10 +18,10 @@ #include <errno.h> #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref) +__pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref) { struct pthread_rwlockattr *iattr; @@ -36,3 +36,10 @@ pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref) return 0; } +versioned_symbol (libc, __pthread_rwlockattr_setkind_np, + pthread_rwlockattr_setkind_np, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_rwlockattr_setkind_np, + pthread_rwlockattr_setkind_np, GLIBC_2_1); +#endif |