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 /nptl/Makefile | |
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 'nptl/Makefile')
-rw-r--r-- | nptl/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index a7c1932332..9c810b2b6c 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -116,6 +116,7 @@ routines = \ pthread_getattr_default_np \ pthread_getattr_np \ pthread_getconcurrency \ + pthread_getcpuclockid \ pthread_getschedparam \ pthread_getspecific \ pthread_join \ @@ -206,7 +207,6 @@ libpthread-routines = \ nptl-init \ pt-interp \ pthread_create \ - pthread_getcpuclockid \ pthread_getname \ pthread_setaffinity \ pthread_setname \ |