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:01 +0200 |
| commit | 575295fc8314b089e52f98de4aa16a9d7aeb9bf4 (patch) | |
| tree | beee73fc51f4c1213cf54e9b137ef9d776eaab66 /sysdeps/pthread | |
| parent | ad201afe5c348de265b92bae6688034102a4386b (diff) | |
| download | glibc-575295fc8314b089e52f98de4aa16a9d7aeb9bf4.tar.gz glibc-575295fc8314b089e52f98de4aa16a9d7aeb9bf4.tar.xz glibc-575295fc8314b089e52f98de4aa16a9d7aeb9bf4.zip | |
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 <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/pthread')
| -rw-r--r-- | sysdeps/pthread/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/pthread/call_once.c | 11 |
2 files changed, 11 insertions, 3 deletions
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 |