From f47f1d91af985a9028fb399da21eab460d887a15 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 21 May 2021 22:35:00 +0200 Subject: nptl: Move pthread_create, thrd_create into libc The symbols were moved using scripts/move-symbol-to-libc.py. The libpthread placeholder symbols need some changes because some symbol versions have gone away completely. But __errno_location@@GLIBC_2.0 still exists, so the GLIBC_2.0 version is still there. The internal __pthread_create symbol now points to the correct function, so the sysdeps/nptl/thrd_create.c override is no longer necessary. There was an issue how the hidden alias of pthread_getattr_default_np was defined, so this commit cleans up that aspects and removes the GLIBC_PRIVATE export altogether. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/sh/be/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/sh/be/libpthread.abilist | 3 +-- sysdeps/unix/sysv/linux/sh/le/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/sh/le/libpthread.abilist | 3 +-- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/sh') diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist index 97942ff01a..0fab90e1e3 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist @@ -1316,6 +1316,7 @@ GLIBC_2.2 pthread_condattr_destroy F GLIBC_2.2 pthread_condattr_getpshared F GLIBC_2.2 pthread_condattr_init F GLIBC_2.2 pthread_condattr_setpshared F +GLIBC_2.2 pthread_create F GLIBC_2.2 pthread_detach F GLIBC_2.2 pthread_equal F GLIBC_2.2 pthread_exit F @@ -2003,6 +2004,7 @@ GLIBC_2.28 mtx_trylock F GLIBC_2.28 mtx_unlock F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F +GLIBC_2.28 thrd_create F GLIBC_2.28 thrd_current F GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_equal F @@ -2273,6 +2275,7 @@ GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F GLIBC_2.34 pthread_condattr_setclock F GLIBC_2.34 pthread_condattr_setpshared F +GLIBC_2.34 pthread_create F GLIBC_2.34 pthread_detach F GLIBC_2.34 pthread_getattr_default_np F GLIBC_2.34 pthread_getconcurrency F @@ -2345,6 +2348,7 @@ GLIBC_2.34 sem_timedwait F GLIBC_2.34 sem_trywait F GLIBC_2.34 sem_unlink F GLIBC_2.34 sem_wait F +GLIBC_2.34 thrd_create F GLIBC_2.34 thrd_detach F GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index cc941573b6..f1adf37ff2 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -2,10 +2,9 @@ GLIBC_2.11 __libpthread_version_placeholder F GLIBC_2.12 __libpthread_version_placeholder F GLIBC_2.18 __libpthread_version_placeholder F GLIBC_2.2 __errno_location F -GLIBC_2.2 pthread_create F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F -GLIBC_2.28 thrd_create F +GLIBC_2.28 __libpthread_version_placeholder F GLIBC_2.3.2 __libpthread_version_placeholder F GLIBC_2.3.3 __libpthread_version_placeholder F GLIBC_2.3.4 __libpthread_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist index 617b673620..2f3a64b580 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist @@ -1316,6 +1316,7 @@ GLIBC_2.2 pthread_condattr_destroy F GLIBC_2.2 pthread_condattr_getpshared F GLIBC_2.2 pthread_condattr_init F GLIBC_2.2 pthread_condattr_setpshared F +GLIBC_2.2 pthread_create F GLIBC_2.2 pthread_detach F GLIBC_2.2 pthread_equal F GLIBC_2.2 pthread_exit F @@ -2003,6 +2004,7 @@ GLIBC_2.28 mtx_trylock F GLIBC_2.28 mtx_unlock F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F +GLIBC_2.28 thrd_create F GLIBC_2.28 thrd_current F GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_equal F @@ -2270,6 +2272,7 @@ GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F GLIBC_2.34 pthread_condattr_setclock F GLIBC_2.34 pthread_condattr_setpshared F +GLIBC_2.34 pthread_create F GLIBC_2.34 pthread_detach F GLIBC_2.34 pthread_getattr_default_np F GLIBC_2.34 pthread_getconcurrency F @@ -2342,6 +2345,7 @@ GLIBC_2.34 sem_timedwait F GLIBC_2.34 sem_trywait F GLIBC_2.34 sem_unlink F GLIBC_2.34 sem_wait F +GLIBC_2.34 thrd_create F GLIBC_2.34 thrd_detach F GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index cc941573b6..f1adf37ff2 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -2,10 +2,9 @@ GLIBC_2.11 __libpthread_version_placeholder F GLIBC_2.12 __libpthread_version_placeholder F GLIBC_2.18 __libpthread_version_placeholder F GLIBC_2.2 __errno_location F -GLIBC_2.2 pthread_create F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F -GLIBC_2.28 thrd_create F +GLIBC_2.28 __libpthread_version_placeholder F GLIBC_2.3.2 __libpthread_version_placeholder F GLIBC_2.3.3 __libpthread_version_placeholder F GLIBC_2.3.4 __libpthread_version_placeholder F -- cgit 1.4.1