diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-11 19:32:43 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-11 19:32:56 +0200 |
| commit | f5bc5f6e2a96b8b03d1bf8199a58b1accc3c4c53 (patch) | |
| tree | ec07ebda3cd20fc27bdca453ce1a421aa7192bd4 /nptl | |
| parent | 572bd547d57a39b6cf0ea072545dc4048921f4c3 (diff) | |
| download | glibc-f5bc5f6e2a96b8b03d1bf8199a58b1accc3c4c53.tar.gz glibc-f5bc5f6e2a96b8b03d1bf8199a58b1accc3c4c53.tar.xz glibc-f5bc5f6e2a96b8b03d1bf8199a58b1accc3c4c53.zip | |
nptl: Move pthread_attr_getaffinity_np into libc
The symbol was moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 5 | ||||
| -rw-r--r-- | nptl/pthread_attr_getaffinity.c | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index f81b2f64df..d55f8c6b00 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -61,6 +61,7 @@ routines = \ pthread_attr_copy \ pthread_attr_destroy \ pthread_attr_extension \ + pthread_attr_getaffinity \ pthread_attr_getdetachstate \ pthread_attr_getinheritsched \ pthread_attr_getschedparam \ @@ -192,7 +193,6 @@ libpthread-routines = \ libpthread-compat \ nptl-init \ pt-interp \ - pthread_attr_getaffinity \ pthread_attr_getguardsize \ pthread_attr_getstack \ pthread_attr_getstackaddr \ diff --git a/nptl/Versions b/nptl/Versions index 8c3e825083..d36c2b12ea 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -144,6 +144,7 @@ libc { GLIBC_2.3.3 { __pthread_cleanup_routine; __pthread_unwind_next; + pthread_attr_getaffinity_np; pthread_attr_setaffinity_np; pthread_barrierattr_getpshared; pthread_condattr_getclock; @@ -153,6 +154,7 @@ libc { pthread_tryjoin_np; } GLIBC_2.3.4 { + pthread_attr_getaffinity_np; pthread_attr_setaffinity_np; } GLIBC_2.4 { @@ -237,6 +239,7 @@ libc { mtx_timedlock; mtx_trylock; mtx_unlock; + pthread_attr_getaffinity_np; pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; @@ -430,12 +433,10 @@ libpthread { __pthread_register_cancel_defer; __pthread_unregister_cancel; __pthread_unregister_cancel_restore; - pthread_attr_getaffinity_np; pthread_setaffinity_np; } GLIBC_2.3.4 { - pthread_attr_getaffinity_np; pthread_getaffinity_np; pthread_setaffinity_np; pthread_setschedprio; diff --git a/nptl/pthread_attr_getaffinity.c b/nptl/pthread_attr_getaffinity.c index 68403ebc25..0b1ca4cef3 100644 --- a/nptl/pthread_attr_getaffinity.c +++ b/nptl/pthread_attr_getaffinity.c @@ -57,10 +57,14 @@ __pthread_attr_getaffinity_new (const pthread_attr_t *attr, size_t cpusetsize, return 0; } versioned_symbol (libpthread, __pthread_attr_getaffinity_new, - pthread_attr_getaffinity_np, GLIBC_2_3_4); + pthread_attr_getaffinity_np, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_4, GLIBC_2_34) +compat_symbol (libpthread, __pthread_attr_getaffinity_new, + pthread_attr_getaffinity_np, GLIBC_2_3_4); +#endif -#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4) +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4) int __pthread_attr_getaffinity_old (const pthread_attr_t *attr, cpu_set_t *cpuset) { |