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 | |
| parent | e948be4db3ed254b6ba55d5250021f649a9a1c41 (diff) | |
| download | 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')
61 files changed, 70 insertions, 29 deletions
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 9ab880c72a..dde11d1d0b 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1494,6 +1494,7 @@ GLIBC_2.17 pthread_exit F GLIBC_2.17 pthread_getaffinity_np F GLIBC_2.17 pthread_getattr_np F GLIBC_2.17 pthread_getconcurrency F +GLIBC_2.17 pthread_getcpuclockid F GLIBC_2.17 pthread_getschedparam F GLIBC_2.17 pthread_getspecific F GLIBC_2.17 pthread_join F @@ -2367,6 +2368,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/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index ebd930eee5..9ac9be4ec4 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -1,6 +1,5 @@ GLIBC_2.17 __errno_location F GLIBC_2.17 pthread_create F -GLIBC_2.17 pthread_getcpuclockid F GLIBC_2.17 pthread_getname_np F GLIBC_2.17 pthread_setaffinity_np F GLIBC_2.17 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index b99aa07295..0c3f66e309 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2031,6 +2031,7 @@ GLIBC_2.2 pthread_barrierattr_init F GLIBC_2.2 pthread_barrierattr_setpshared F GLIBC_2.2 pthread_condattr_getpshared F GLIBC_2.2 pthread_condattr_setpshared F +GLIBC_2.2 pthread_getcpuclockid F GLIBC_2.2 pthread_mutex_timedlock F GLIBC_2.2 pthread_mutexattr_getpshared F GLIBC_2.2 pthread_mutexattr_setpshared F @@ -2457,6 +2458,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/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 4f5f151530..ae50cb30c6 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -7,7 +7,7 @@ GLIBC_2.11 pthread_sigqueue F GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 __libpthread_version_placeholder F -GLIBC_2.2 pthread_getcpuclockid 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 diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 4a4ae72dad..129040de57 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1436,6 +1436,7 @@ GLIBC_2.32 pthread_getaffinity_np F GLIBC_2.32 pthread_getattr_default_np F GLIBC_2.32 pthread_getattr_np F GLIBC_2.32 pthread_getconcurrency F +GLIBC_2.32 pthread_getcpuclockid F GLIBC_2.32 pthread_getschedparam F GLIBC_2.32 pthread_getspecific F GLIBC_2.32 pthread_join F @@ -2126,6 +2127,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/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index 9bb26a4ac4..88273f1424 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -1,6 +1,5 @@ GLIBC_2.32 __errno_location F GLIBC_2.32 pthread_create F -GLIBC_2.32 pthread_getcpuclockid F GLIBC_2.32 pthread_getname_np F GLIBC_2.32 pthread_setaffinity_np F GLIBC_2.32 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index c86ef8913d..822b3f4005 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -236,6 +236,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 @@ -1736,6 +1737,7 @@ GLIBC_2.4 pthread_exit F GLIBC_2.4 pthread_getaffinity_np F GLIBC_2.4 pthread_getattr_np F GLIBC_2.4 pthread_getconcurrency F +GLIBC_2.4 pthread_getcpuclockid F GLIBC_2.4 pthread_getschedparam F GLIBC_2.4 pthread_getspecific F GLIBC_2.4 pthread_join F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index b550c922bf..7d023cb181 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -8,6 +8,5 @@ GLIBC_2.31 __libpthread_version_placeholder F GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F GLIBC_2.4 pthread_create F -GLIBC_2.4 pthread_getcpuclockid F GLIBC_2.4 pthread_setaffinity_np F GLIBC_2.4 pthread_setschedprio F diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index 627b485571..e38c13db21 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -233,6 +233,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 @@ -1733,6 +1734,7 @@ GLIBC_2.4 pthread_exit F GLIBC_2.4 pthread_getaffinity_np F GLIBC_2.4 pthread_getattr_np F GLIBC_2.4 pthread_getconcurrency F |