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/s390/s390-32/libc.abilist | 5 +++++ sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist | 5 ++--- sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist | 3 +-- 4 files changed, 12 insertions(+), 5 deletions(-) (limited to 'sysdeps/unix/sysv/linux/s390') diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index 2274342208..b699dedcc1 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -873,6 +873,7 @@ GLIBC_2.0 pthread_cond_timedwait F GLIBC_2.0 pthread_cond_wait F GLIBC_2.0 pthread_condattr_destroy F GLIBC_2.0 pthread_condattr_init F +GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F GLIBC_2.0 pthread_equal F GLIBC_2.0 pthread_exit F @@ -1584,6 +1585,7 @@ GLIBC_2.1 pthread_attr_init F GLIBC_2.1 pthread_attr_setguardsize F GLIBC_2.1 pthread_attr_setstackaddr F GLIBC_2.1 pthread_attr_setstacksize F +GLIBC_2.1 pthread_create F GLIBC_2.1 pthread_getconcurrency F GLIBC_2.1 pthread_mutexattr_gettype F GLIBC_2.1 pthread_mutexattr_settype F @@ -2135,6 +2137,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 @@ -2417,6 +2420,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 @@ -2489,6 +2493,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/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index faae6bcf76..ac212e942a 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -1,6 +1,5 @@ GLIBC_2.0 __errno_location F -GLIBC_2.0 pthread_create F -GLIBC_2.1 pthread_create F +GLIBC_2.1 __libpthread_version_placeholder F GLIBC_2.1.1 __libpthread_version_placeholder F GLIBC_2.1.2 __libpthread_version_placeholder F GLIBC_2.11 __libpthread_version_placeholder F @@ -10,7 +9,7 @@ GLIBC_2.19 __libpthread_version_placeholder F GLIBC_2.2 __libpthread_version_placeholder 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/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 14d1c5e7f8..94209858b1 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -1330,6 +1330,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 @@ -2026,6 +2027,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 @@ -2304,6 +2306,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 @@ -2376,6 +2379,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/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index ac3a2834dc..e0feab34d5 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -3,10 +3,9 @@ GLIBC_2.12 __libpthread_version_placeholder F GLIBC_2.18 __libpthread_version_placeholder F GLIBC_2.19 __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