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:14:49 +0200 |
commit | eef936eb458e5dfccceee6d3c4220f9a1c62832b (patch) | |
tree | 00c1601e791ccc135b4c37385520b997bb30331f /nptl | |
parent | 3eab466e566c5c28cbec55b092fe21e134baac22 (diff) | |
download | glibc-eef936eb458e5dfccceee6d3c4220f9a1c62832b.tar.gz glibc-eef936eb458e5dfccceee6d3c4220f9a1c62832b.tar.xz glibc-eef936eb458e5dfccceee6d3c4220f9a1c62832b.zip |
nptl: Move cnd_signal into libc
The symbol was moved using scripts/move-symbol-to-libc.py. The __pthread_cond_signal@@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_signal.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nptl/Versions b/nptl/Versions index 3b11cc1797..b18709c8e1 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -130,6 +130,7 @@ libc { cnd_broadcast; cnd_destroy; cnd_init; + cnd_signal; thrd_current; thrd_equal; thrd_sleep; @@ -162,6 +163,7 @@ libc { cnd_broadcast; cnd_destroy; cnd_init; + cnd_signal; pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; @@ -224,7 +226,6 @@ libc { __pthread_cleanup_pop; __pthread_cleanup_push; __pthread_cleanup_upto; - __pthread_cond_signal; # Used by the C11 threads. __pthread_cond_timedwait; # Used by the C11 threads. __pthread_cond_wait; # Used by the C11 threads. __pthread_current_priority; @@ -377,7 +378,6 @@ libpthread { # C11 thread symbols. GLIBC_2.28 { - cnd_signal; cnd_timedwait; cnd_wait; mtx_destroy; diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c index 17b4a69702..171193b13e 100644 --- a/nptl/pthread_cond_signal.c +++ b/nptl/pthread_cond_signal.c @@ -98,5 +98,6 @@ ___pthread_cond_signal (pthread_cond_t *cond) versioned_symbol (libpthread, ___pthread_cond_signal, pthread_cond_signal, GLIBC_2_3_2); libc_hidden_ver (___pthread_cond_signal, __pthread_cond_signal) -versioned_symbol (libpthread, ___pthread_cond_signal, - __pthread_cond_signal, GLIBC_PRIVATE); +#ifndef SHARED +strong_alias (___pthread_cond_signal, __pthread_cond_signal) +#endif |