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:45 +0200 |
| commit | 0505ae4e3b6d18b7ed1ec4c9b2d7e890acadec93 (patch) | |
| tree | 472d35373b9ec3bb8db4ecb633aced0124603573 /nptl | |
| parent | b444409479e34c80f27742e7017ea5741fe548d7 (diff) | |
| download | glibc-0505ae4e3b6d18b7ed1ec4c9b2d7e890acadec93.tar.gz glibc-0505ae4e3b6d18b7ed1ec4c9b2d7e890acadec93.tar.xz glibc-0505ae4e3b6d18b7ed1ec4c9b2d7e890acadec93.zip | |
nptl: Move pthread_rwlockattr_setpshared 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_setpshared.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 757e5e4238..e3f9a2053a 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -136,6 +136,7 @@ routines = \ pthread_rwlockattr_getpshared \ pthread_rwlockattr_init \ pthread_rwlockattr_setkind_np \ + pthread_rwlockattr_setpshared \ pthread_self \ pthread_setcancelstate \ pthread_setcanceltype \ @@ -191,7 +192,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_rwlockattr_setpshared \ pthread_setaffinity \ pthread_setattr_default_np \ pthread_setconcurrency \ diff --git a/nptl/Versions b/nptl/Versions index 450c3727ab..9c92e9ec84 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -78,6 +78,7 @@ libc { pthread_rwlockattr_getpshared; pthread_rwlockattr_init; pthread_rwlockattr_setkind_np; + pthread_rwlockattr_setpshared; } GLIBC_2.2 { __pthread_rwlock_destroy; @@ -236,6 +237,7 @@ libc { pthread_rwlockattr_getpshared; pthread_rwlockattr_init; pthread_rwlockattr_setkind_np; + pthread_rwlockattr_setpshared; pthread_setspecific; pthread_spin_destroy; pthread_spin_init; @@ -322,7 +324,6 @@ libpthread { pthread_attr_setstacksize; pthread_create; pthread_getconcurrency; - pthread_rwlockattr_setpshared; pthread_setconcurrency; sem_destroy; sem_getvalue; diff --git a/nptl/pthread_rwlockattr_setpshared.c b/nptl/pthread_rwlockattr_setpshared.c index 2e42754466..e8f603788e 100644 --- a/nptl/pthread_rwlockattr_setpshared.c +++ b/nptl/pthread_rwlockattr_setpshared.c @@ -19,10 +19,10 @@ #include <errno.h> #include "pthreadP.h" #include <futex-internal.h> - +#include <shlib-compat.h> int -pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared) +__pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared) { struct pthread_rwlockattr *iattr; @@ -36,3 +36,10 @@ pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared) return 0; } +versioned_symbol (libc, __pthread_rwlockattr_setpshared, + pthread_rwlockattr_setpshared, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_rwlockattr_setpshared, + pthread_rwlockattr_setpshared, GLIBC_2_1); +#endif |