From 575295fc8314b089e52f98de4aa16a9d7aeb9bf4 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 08:12:11 +0200 Subject: nptl: Move call_once into libc The symbol was moved using scripts/move-symbol-to-libc.py. This change also turns __pthread_once into a compatibility symbol because after the call_once move, an internal call to __pthread_once can be used. This an adjustment to __libc_once: Outside libc (e.g., in nscd), it has to call pthread_once. With __pthread_once as a compatibility symbol, it is no longer to add a new GLIBC_2.34 version after the move from libpthread, and this commit removes the new __pthread_once@@GLIBC_2.34 version. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/pthread/call_once.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'sysdeps/pthread/call_once.c') diff --git a/sysdeps/pthread/call_once.c b/sysdeps/pthread/call_once.c index 9690530..0847dbc 100644 --- a/sysdeps/pthread/call_once.c +++ b/sysdeps/pthread/call_once.c @@ -17,11 +17,12 @@ . */ #include +#include #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 -- cgit v1.1