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:10 +0200 |
| commit | cf3fff1c195f859ba949a7ad86d4fca70bd99740 (patch) | |
| tree | bcf3acd913ad5df143e703f5f1324e638db6f448 /nptl | |
| parent | 08a31ef923c51dc5ff2ef815730de0ba4d591ae3 (diff) | |
| download | glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.tar.gz glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.tar.xz glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.zip | |
nptl: Move cnd_wait into libc
The symbol was moved using scripts/move-symbol-to-libc.py. The __pthread_cond_wait@@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 | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nptl/Versions b/nptl/Versions index 1aecde43ed..414349eadc 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -132,6 +132,7 @@ libc { cnd_init; cnd_signal; cnd_timedwait; + cnd_wait; thrd_current; thrd_equal; thrd_sleep; @@ -166,6 +167,7 @@ libc { cnd_init; cnd_signal; cnd_timedwait; + cnd_wait; pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; @@ -228,7 +230,6 @@ libc { __pthread_cleanup_pop; __pthread_cleanup_push; __pthread_cleanup_upto; - __pthread_cond_wait; # Used by the C11 threads. __pthread_current_priority; __pthread_exit; __pthread_force_elision; @@ -379,7 +380,6 @@ libpthread { # C11 thread symbols. GLIBC_2.28 { - cnd_wait; mtx_destroy; mtx_init; mtx_lock; diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c index 89ea231554..54e504a6b5 100644 --- a/nptl/pthread_cond_wait.c +++ b/nptl/pthread_cond_wait.c @@ -622,8 +622,6 @@ ___pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex) versioned_symbol (libc, ___pthread_cond_wait, pthread_cond_wait, GLIBC_2_3_2); libc_hidden_ver (___pthread_cond_wait, __pthread_cond_wait) -versioned_symbol (libc, ___pthread_cond_wait, __pthread_cond_wait, - GLIBC_PRIVATE); /* See __pthread_cond_wait_common. */ int |