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:17 +0200 |
| commit | 0431f171daefc436b8d185d852e45800745d7496 (patch) | |
| tree | f2bb2b5e813b7c38bcba8bc76794b97720749ec8 /nptl | |
| parent | 575295fc8314b089e52f98de4aa16a9d7aeb9bf4 (diff) | |
| download | glibc-0431f171daefc436b8d185d852e45800745d7496.tar glibc-0431f171daefc436b8d185d852e45800745d7496.tar.gz glibc-0431f171daefc436b8d185d852e45800745d7496.tar.bz2 glibc-0431f171daefc436b8d185d852e45800745d7496.zip | |
nptl: Move cnd_broadcast into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
The __pthread_cond_broadcast@@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_broadcast.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nptl/Versions b/nptl/Versions index 1217a15bdf..fc34e59b70 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -127,6 +127,7 @@ libc { # C11 thread symbols. GLIBC_2.28 { call_once; + cnd_broadcast; thrd_current; thrd_equal; thrd_sleep; @@ -156,6 +157,7 @@ libc { __pthread_mutexattr_settype; __pthread_setspecific; call_once; + cnd_broadcast; pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; @@ -218,7 +220,6 @@ libc { __pthread_cleanup_pop; __pthread_cleanup_push; __pthread_cleanup_upto; - __pthread_cond_broadcast; # Used by the C11 threads. __pthread_cond_destroy; # Used by the C11 threads. __pthread_cond_init; # Used by the C11 threads. __pthread_cond_signal; # Used by the C11 threads. @@ -374,7 +375,6 @@ libpthread { # C11 thread symbols. GLIBC_2.28 { - cnd_broadcast; cnd_destroy; cnd_init; cnd_signal; diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c index 4af99544d2..f1275b2f15 100644 --- a/nptl/pthread_cond_broadcast.c +++ b/nptl/pthread_cond_broadcast.c @@ -90,5 +90,6 @@ ___pthread_cond_broadcast (pthread_cond_t *cond) versioned_symbol (libc, ___pthread_cond_broadcast, pthread_cond_broadcast, GLIBC_2_3_2); libc_hidden_ver (___pthread_cond_broadcast, __pthread_cond_broadcast) -versioned_symbol (libc, ___pthread_cond_broadcast, - __pthread_cond_broadcast, GLIBC_PRIVATE); +#ifndef SHARED +strong_alias (___pthread_cond_broadcast, __pthread_cond_broadcast) +#endif |