diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 11:02:54 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 11:02:54 +0200 |
| commit | 6a75fefc2c05f1100d1ecd4bd195ea73c1b1a954 (patch) | |
| tree | 40d94e759e984c2957ae28b28eb4db2e2b8494aa /nptl | |
| parent | 2a775a9ea574957248e333595a35a75e43c946dc (diff) | |
| download | glibc-6a75fefc2c05f1100d1ecd4bd195ea73c1b1a954.tar.gz glibc-6a75fefc2c05f1100d1ecd4bd195ea73c1b1a954.tar.xz glibc-6a75fefc2c05f1100d1ecd4bd195ea73c1b1a954.zip | |
nptl: Move pthread_condattr_setclock 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_setclock.c | 9 |
3 files changed, 11 insertions, 3 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index a1571a0990..040a27c19b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -83,6 +83,7 @@ routines = \ pthread_condattr_getclock \ pthread_condattr_getpshared \ pthread_condattr_init \ + pthread_condattr_setclock \ pthread_equal \ pthread_exit \ pthread_getaffinity \ @@ -164,7 +165,6 @@ libpthread-routines = \ pthread_barrierattr_setpshared \ pthread_cancel \ pthread_clockjoin \ - pthread_condattr_setclock \ pthread_condattr_setpshared \ pthread_create \ pthread_detach \ diff --git a/nptl/Versions b/nptl/Versions index d6ee40b5bb..a141308780 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -96,6 +96,7 @@ libc { __pthread_unwind_next; pthread_attr_setaffinity_np; pthread_condattr_getclock; + pthread_condattr_setclock; pthread_getaffinity_np; } GLIBC_2.3.4 { @@ -151,6 +152,7 @@ libc { pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; + pthread_condattr_setclock; pthread_getspecific; pthread_key_create; pthread_key_delete; @@ -335,7 +337,6 @@ libpthread { __pthread_unregister_cancel_restore; pthread_attr_getaffinity_np; pthread_barrierattr_getpshared; - pthread_condattr_setclock; pthread_setaffinity_np; pthread_timedjoin_np; pthread_tryjoin_np; diff --git a/nptl/pthread_condattr_setclock.c b/nptl/pthread_condattr_setclock.c index 9bb3dd3739..536ab6564e 100644 --- a/nptl/pthread_condattr_setclock.c +++ b/nptl/pthread_condattr_setclock.c @@ -25,7 +25,7 @@ int -pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock_id) +__pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock_id) { /* Only a few clocks are allowed. */ if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME) @@ -43,3 +43,10 @@ pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock_id) return 0; } +versioned_symbol (libc, __pthread_condattr_setclock, + pthread_condattr_setclock, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34) +compat_symbol (libpthread, __pthread_condattr_setclock, + pthread_condattr_setclock, GLIBC_2_3_3); +#endif |