diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:12:11 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:15:04 +0200 |
| commit | 08a31ef923c51dc5ff2ef815730de0ba4d591ae3 (patch) | |
| tree | b86649471801e4039a1d6c79e6c82b1aaf53bdee /nptl | |
| parent | eef936eb458e5dfccceee6d3c4220f9a1c62832b (diff) | |
| download | glibc-08a31ef923c51dc5ff2ef815730de0ba4d591ae3.zip glibc-08a31ef923c51dc5ff2ef815730de0ba4d591ae3.tar.gz glibc-08a31ef923c51dc5ff2ef815730de0ba4d591ae3.tar.bz2 | |
nptl: Move cnd_timedwait into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
The __pthread_cond_timedwait@@GLIBC_PRIVATE symbol is no longer
neded, so remove that as well.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Versions | 4 | ||||
| -rw-r--r-- | nptl/pthread_cond_wait.c | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nptl/Versions b/nptl/Versions index b18709c..1aecde4 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -131,6 +131,7 @@ libc { cnd_destroy; cnd_init; cnd_signal; + cnd_timedwait; thrd_current; thrd_equal; thrd_sleep; @@ -164,6 +165,7 @@ libc { cnd_destroy; cnd_init; cnd_signal; + cnd_timedwait; pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; @@ -226,7 +228,6 @@ libc { __pthread_cleanup_pop; __pthread_cleanup_push; __pthread_cleanup_upto; - __pthread_cond_timedwait; # Used by the C11 threads. __pthread_cond_wait; # Used by the C11 threads. __pthread_current_priority; __pthread_exit; @@ -378,7 +379,6 @@ libpthread { # C11 thread symbols. GLIBC_2.28 { - cnd_timedwait; cnd_wait; mtx_destroy; mtx_init; diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c index 5a1642b..89ea231 100644 --- a/nptl/pthread_cond_wait.c +++ b/nptl/pthread_cond_wait.c @@ -646,9 +646,10 @@ ___pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex, #if __TIMESIZE == 64 strong_alias (___pthread_cond_timedwait64, ___pthread_cond_timedwait) #else -versioned_symbol (libc, ___pthread_cond_timedwait64, - __pthread_cond_timedwait64, GLIBC_PRIVATE); libc_hidden_ver (___pthread_cond_timedwait64, __pthread_cond_timedwait64) +#ifndef SHARED +strong_alias (___pthread_cond_timedwait64, __pthread_cond_timedwait64) +#endif int ___pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex, @@ -662,8 +663,9 @@ ___pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex, versioned_symbol (libc, ___pthread_cond_timedwait, pthread_cond_timedwait, GLIBC_2_3_2); libc_hidden_ver (___pthread_cond_timedwait, __pthread_cond_timedwait) -versioned_symbol (libc, ___pthread_cond_timedwait, - __pthread_cond_timedwait, GLIBC_PRIVATE); +#ifndef SHARED +strong_alias (___pthread_cond_timedwait, __pthread_cond_timedwait) +#endif /* See __pthread_cond_wait_common. */ int |