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/sparc | |
| 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/sparc')
4 files changed, 5 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index a47858e4d1..d0870d3d75 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -1995,6 +1995,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 @@ -2406,6 +2407,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/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index 4f5f151530..ae50cb30c6 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/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/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index 50777a3806..58a3cdb004 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -1360,6 +1360,7 @@ GLIBC_2.2 pthread_detach F GLIBC_2.2 pthread_equal F GLIBC_2.2 pthread_exit F GLIBC_2.2 pthread_getconcurrency F +GLIBC_2.2 pthread_getcpuclockid F GLIBC_2.2 pthread_getschedparam F GLIBC_2.2 pthread_getspecific F GLIBC_2.2 pthread_join F @@ -2319,6 +2320,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/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index 96d1dd51d2..1c20789e32 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -4,7 +4,6 @@ GLIBC_2.12 pthread_setname_np F GLIBC_2.18 __libpthread_version_placeholder F GLIBC_2.2 __errno_location F GLIBC_2.2 pthread_create F -GLIBC_2.2 pthread_getcpuclockid F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 thrd_create F |