diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-17 09:59:14 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-17 10:25:11 +0200 |
| commit | 310e59e64cbc95bff299825b2b7f38b88f82ba4e (patch) | |
| tree | ab18cc279a1e63dcdc1b79a15e43ce8a2b775c3a /sysdeps/unix/sysv/linux/x86_64 | |
| parent | e948be4db3ed254b6ba55d5250021f649a9a1c41 (diff) | |
| download | glibc-310e59e64cbc95bff299825b2b7f38b88f82ba4e.tar.gz glibc-310e59e64cbc95bff299825b2b7f38b88f82ba4e.tar.xz glibc-310e59e64cbc95bff299825b2b7f38b88f82ba4e.zip | |
nptl: Move pthread_getcpuclockid into libc
The symbol was moved using scripts/move-symbol-to-libc.py. __libpthread_version_placeholder@@GLIBC_2.2 is needed by this change; the Versions entry for GLIBC_2.2 in libpthread had leftover symbols due to an error in a previous conflict resolution. The condition for the placeholder symbol is complicated because some architectures have earlier symbols at the GLIBC_2.2 symbol versions, so the placeholder is not required there (yet). Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64')
4 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 922730fc2c..a71bd400c6 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -1328,6 +1328,7 @@ GLIBC_2.2.5 pthread_equal F GLIBC_2.2.5 pthread_exit F GLIBC_2.2.5 pthread_getattr_np F GLIBC_2.2.5 pthread_getconcurrency F +GLIBC_2.2.5 pthread_getcpuclockid F GLIBC_2.2.5 pthread_getschedparam F GLIBC_2.2.5 pthread_getspecific F GLIBC_2.2.5 pthread_join F @@ -2278,6 +2279,7 @@ GLIBC_2.34 pthread_condattr_setpshared F GLIBC_2.34 pthread_detach F GLIBC_2.34 pthread_getattr_default_np F GLIBC_2.34 pthread_getconcurrency F +GLIBC_2.34 pthread_getcpuclockid F GLIBC_2.34 pthread_getspecific F GLIBC_2.34 pthread_join F GLIBC_2.34 pthread_key_create F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 9b6138ac89..040c0b7b8e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -4,7 +4,6 @@ GLIBC_2.12 pthread_setname_np F GLIBC_2.18 __libpthread_version_placeholder F GLIBC_2.2.5 __errno_location F GLIBC_2.2.5 pthread_create F -GLIBC_2.2.5 pthread_getcpuclockid F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 thrd_create F GLIBC_2.3.2 __libpthread_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index b232b5545e..cb321c43b3 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -1501,6 +1501,7 @@ GLIBC_2.16 pthread_exit F GLIBC_2.16 pthread_getaffinity_np F GLIBC_2.16 pthread_getattr_np F GLIBC_2.16 pthread_getconcurrency F +GLIBC_2.16 pthread_getcpuclockid F GLIBC_2.16 pthread_getschedparam F GLIBC_2.16 pthread_getspecific F GLIBC_2.16 pthread_join F @@ -2382,6 +2383,7 @@ GLIBC_2.34 pthread_condattr_setpshared F GLIBC_2.34 pthread_detach F GLIBC_2.34 pthread_getattr_default_np F GLIBC_2.34 pthread_getconcurrency F +GLIBC_2.34 pthread_getcpuclockid F GLIBC_2.34 pthread_getspecific F GLIBC_2.34 pthread_join F GLIBC_2.34 pthread_key_create F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index 0554188755..357774d540 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -1,6 +1,5 @@ GLIBC_2.16 __errno_location F GLIBC_2.16 pthread_create F -GLIBC_2.16 pthread_getcpuclockid F GLIBC_2.16 pthread_getname_np F GLIBC_2.16 pthread_setaffinity_np F GLIBC_2.16 pthread_setname_np F |