diff options
66 files changed, 88 insertions, 69 deletions
diff --git a/nptl/Versions b/nptl/Versions index 03e159ee0f..1217a15bdf 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -126,6 +126,7 @@ libc { } # C11 thread symbols. GLIBC_2.28 { + call_once; thrd_current; thrd_equal; thrd_sleep; @@ -153,8 +154,8 @@ libc { __pthread_mutex_unlock; __pthread_mutexattr_init; __pthread_mutexattr_settype; - __pthread_once; __pthread_setspecific; + call_once; pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; @@ -373,7 +374,6 @@ libpthread { # C11 thread symbols. GLIBC_2.28 { - call_once; cnd_broadcast; cnd_destroy; cnd_init; diff --git a/nptl/pthread_once.c b/nptl/pthread_once.c index 323583c118..e8cf54cf96 100644 --- a/nptl/pthread_once.c +++ b/nptl/pthread_once.c @@ -143,8 +143,10 @@ ___pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) else return __pthread_once_slow (once_control, init_routine); } -versioned_symbol (libc, ___pthread_once, __pthread_once, GLIBC_2_34); libc_hidden_ver (___pthread_once, __pthread_once) +#ifndef SHARED +strong_alias (___pthread_once, __pthread_once) +#endif versioned_symbol (libc, ___pthread_once, pthread_once, GLIBC_2_34); #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h index e573689799..aad9c9778c 100644 --- a/sysdeps/nptl/libc-lockP.h +++ b/sysdeps/nptl/libc-lockP.h @@ -210,9 +210,15 @@ _Static_assert (LLL_LOCK_INITIALIZER == 0, "LLL_LOCK_INITIALIZER != 0"); CLASS pthread_once_t NAME = PTHREAD_ONCE_INIT #endif -/* Call handler iff the first call. */ -#define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \ +/* Call handler iff the first call. Use a local call in libc, but the + global pthread_once symbol elsewhere. */ +#if IS_IN (libc) +# define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \ __pthread_once (&(ONCE_CONTROL), INIT_FUNCTION) +#else +# define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \ + pthread_once (&(ONCE_CONTROL), INIT_FUNCTION) +#endif /* Get once control variable. */ #define __libc_once_get(ONCE_CONTROL) ((ONCE_CONTROL) != PTHREAD_ONCE_INIT) diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 8133bcda8f..adb4815b4e 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -32,7 +32,6 @@ headers += threads.h routines += thrd_current thrd_equal thrd_sleep thrd_yield libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \ - call_once \ mtx_destroy mtx_init mtx_lock mtx_timedlock \ mtx_trylock mtx_unlock \ cnd_broadcast \ @@ -40,7 +39,7 @@ libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \ tss_create tss_delete tss_get tss_set $(libpthread-routines-var) += \ - + call_once \ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \ diff --git a/sysdeps/pthread/call_once.c b/sysdeps/pthread/call_once.c index 9690530ab2..0847dbc9f4 100644 --- a/sysdeps/pthread/call_once.c +++ b/sysdeps/pthread/call_once.c @@ -17,11 +17,12 @@ <https://www.gnu.org/licenses/>. */ #include <stdalign.h> +#include <shlib-compat.h> #include "thrd_priv.h" void -call_once (once_flag *flag, void (*func)(void)) +__call_once (once_flag *flag, void (*func)(void)) { _Static_assert (sizeof (once_flag) == sizeof (pthread_once_t), "sizeof (once_flag) != sizeof (pthread_once_t)"); @@ -29,3 +30,11 @@ call_once (once_flag *flag, void (*func)(void)) "alignof (once_flag) != alignof (pthread_once_t)"); __pthread_once ((pthread_once_t *) flag, func); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __call_once, call_once, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __call_once, call_once, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__call_once, call_once) +#endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 96f61e91b5..c11ab22ceb 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -2198,6 +2198,7 @@ GLIBC_2.27 wcstof64 F GLIBC_2.27 wcstof64_l F GLIBC_2.27 wcstof64x F GLIBC_2.27 wcstof64x_l F +GLIBC_2.28 call_once F GLIBC_2.28 fcntl64 F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F @@ -2247,9 +2248,9 @@ GLIBC_2.34 __pthread_mutex_trylock F GLIBC_2.34 __pthread_mutex_unlock F GLIBC_2.34 __pthread_mutexattr_init F GLIBC_2.34 __pthread_mutexattr_settype F -GLIBC_2.34 __pthread_once F GLIBC_2.34 __pthread_setspecific F GLIBC_2.34 __pthread_unwind_next F +GLIBC_2.34 call_once F GLIBC_2.34 pthread_cond_clockwait F GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index 2f584deb17..d0f5f7b12c 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -69,7 +69,6 @@ GLIBC_2.17 sem_unlink F GLIBC_2.17 sem_wait F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F GLIBC_2.28 cnd_destroy F GLIBC_2.28 cnd_init F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 46e59e73f8..6c97010471 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2091,6 +2091,7 @@ GLIBC_2.27 wcstof64 F GLIBC_2.27 wcstof64_l F GLIBC_2.27 wcstof64x F GLIBC_2.27 wcstof64x_l F +GLIBC_2.28 call_once F GLIBC_2.28 fcntl64 F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F @@ -2328,9 +2329,9 @@ GLIBC_2.34 __pthread_mutex_trylock F GLIBC_2.34 __pthread_mutex_unlock F GLIBC_2.34 __pthread_mutexattr_init F GLIBC_2.34 __pthread_mutexattr_settype F -GLIBC_2.34 __pthread_once F GLIBC_2.34 __pthread_setspecific F GLIBC_2.34 __pthread_unwind_next F +GLIBC_2.34 call_once F GLIBC_2.34 pthread_co |