diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 10:55:07 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 10:55:07 +0200 |
| commit | ed00dcbbd695fedfc60591da24b3555db03b3dd9 (patch) | |
| tree | 290f20ebf5ae38c197ef30f3c13e28e7cd8d1bb9 /nptl | |
| parent | b76c066d092d78124deeba9b687f5b10924e97de (diff) | |
| download | glibc-ed00dcbbd695fedfc60591da24b3555db03b3dd9.tar.gz glibc-ed00dcbbd695fedfc60591da24b3555db03b3dd9.tar.xz glibc-ed00dcbbd695fedfc60591da24b3555db03b3dd9.zip | |
nptl: Move pthread_condattr_getclock into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 3 | ||||
| -rw-r--r-- | nptl/pthread_condattr_getclock.c | 12 |
3 files changed, 13 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 99a54ff975..b7903bdc33 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -80,6 +80,7 @@ routines = \ pthread_cond_signal \ pthread_cond_wait \ pthread_condattr_destroy \ + pthread_condattr_getclock \ pthread_condattr_init \ pthread_equal \ pthread_exit \ @@ -162,7 +163,6 @@ libpthread-routines = \ pthread_barrierattr_setpshared \ pthread_cancel \ pthread_clockjoin \ - pthread_condattr_getclock \ pthread_condattr_getpshared \ pthread_condattr_setclock \ pthread_condattr_setpshared \ diff --git a/nptl/Versions b/nptl/Versions index 87412e674a..962f3ae1dc 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -94,6 +94,7 @@ libc { __pthread_cleanup_routine; __pthread_unwind_next; pthread_attr_setaffinity_np; + pthread_condattr_getclock; pthread_getaffinity_np; } GLIBC_2.3.4 { @@ -147,6 +148,7 @@ libc { __pthread_once; __pthread_setspecific; pthread_cond_clockwait; + pthread_condattr_getclock; pthread_getspecific; pthread_key_create; pthread_key_delete; @@ -332,7 +334,6 @@ libpthread { __pthread_unregister_cancel_restore; pthread_attr_getaffinity_np; pthread_barrierattr_getpshared; - pthread_condattr_getclock; pthread_condattr_setclock; pthread_setaffinity_np; pthread_timedjoin_np; diff --git a/nptl/pthread_condattr_getclock.c b/nptl/pthread_condattr_getclock.c index 64a92a14cb..ad5655dbce 100644 --- a/nptl/pthread_condattr_getclock.c +++ b/nptl/pthread_condattr_getclock.c @@ -17,12 +17,20 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_condattr_getclock (const pthread_condattr_t *attr, clockid_t *clock_id) +__pthread_condattr_getclock (const pthread_condattr_t *attr, + clockid_t *clock_id) { *clock_id = (((((const struct pthread_condattr *) attr)->value) >> 1) & ((1 << COND_CLOCK_BITS) - 1)); return 0; } +versioned_symbol (libc, __pthread_condattr_getclock, + pthread_condattr_getclock, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34) +compat_symbol (libpthread, __pthread_condattr_getclock, + pthread_condattr_getclock, GLIBC_2_3_3); +#endif |