From 96e61709b49c3ebe4fa49c235ddafaad1f1dfc84 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 08:12:12 +0200 Subject: nptl: Move thrd_exit into libc The symbol was moved using scripts/move-symbol-to-libc.py. The __pthread_exit@@GLIBC_PRIVATE symbol is no longer needed after this change, so remove it. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/pthread/Makefile | 3 ++- sysdeps/pthread/thrd_exit.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'sysdeps/pthread') diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 6f204cc..75a74be 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -31,7 +31,7 @@ headers += threads.h routines += thrd_current thrd_equal thrd_sleep thrd_yield -libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \ +libpthread-routines += thrd_create thrd_detach thrd_join \ tss_create tss_delete tss_get tss_set $(libpthread-routines-var) += \ @@ -48,6 +48,7 @@ $(libpthread-routines-var) += \ mtx_timedlock \ mtx_trylock \ mtx_unlock \ + thrd_exit \ 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/thrd_exit.c b/sysdeps/pthread/thrd_exit.c index 7348e83..1554af4 100644 --- a/sysdeps/pthread/thrd_exit.c +++ b/sysdeps/pthread/thrd_exit.c @@ -16,10 +16,19 @@ License along with the GNU C Library; if not, see . */ +#include #include "thrd_priv.h" _Noreturn void -thrd_exit (int res) +__thrd_exit (int res) { __pthread_exit ((void*)(uintptr_t) res); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __thrd_exit, thrd_exit, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __thrd_exit, thrd_exit, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__thrd_exit, thrd_exit) +#endif -- cgit v1.1