diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-22 19:50:16 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-22 19:50:16 +0200 |
| commit | e4f1c0de9c7d3fd2e569551b2619d2eb34fd09c6 (patch) | |
| tree | 9c589515261575cd6cd984191c215d842a5b6217 /nptl | |
| parent | 7fc9152e831fb24091c0ceabdcecb9b07dd29dd6 (diff) | |
| download | glibc-e4f1c0de9c7d3fd2e569551b2619d2eb34fd09c6.tar glibc-e4f1c0de9c7d3fd2e569551b2619d2eb34fd09c6.tar.gz glibc-e4f1c0de9c7d3fd2e569551b2619d2eb34fd09c6.tar.bz2 glibc-e4f1c0de9c7d3fd2e569551b2619d2eb34fd09c6.zip | |
nptl: Move pthread_kill_other_threads_np compatibility symbol into libc
And stop including the function for new architectures.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 2 | ||||
| -rw-r--r-- | nptl/pthread_kill_other_threads.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 103257dc74..a3d1ef8d66 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -91,6 +91,7 @@ routines = \ pthread_key_delete \ pthread_keys \ pthread_kill \ + pthread_kill_other_threads \ pthread_mutex_cond_lock \ pthread_mutex_conf \ pthread_mutex_consistent \ @@ -157,7 +158,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_kill_other_threads \ pthread_mutex_getprioceiling \ pthread_mutex_setprioceiling \ pthread_mutex_timedlock \ diff --git a/nptl/Versions b/nptl/Versions index cf4815ea25..a14f404f88 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -40,6 +40,7 @@ libc { pthread_key_create; pthread_key_delete; pthread_kill; + pthread_kill_other_threads_np; pthread_mutex_destroy; pthread_mutex_init; pthread_mutex_lock; @@ -198,7 +199,6 @@ libpthread { pthread_create; pthread_detach; pthread_join; - pthread_kill_other_threads_np; pthread_mutex_trylock; pthread_mutexattr_destroy; pthread_mutexattr_getkind_np; diff --git a/nptl/pthread_kill_other_threads.c b/nptl/pthread_kill_other_threads.c index 44018db50d..0cb336e4f8 100644 --- a/nptl/pthread_kill_other_threads.c +++ b/nptl/pthread_kill_other_threads.c @@ -18,8 +18,7 @@ #include <shlib-compat.h> - -#ifdef SHARED +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) /* This function does not serve a useful purpose in the thread library implementation anymore. It used to be necessary when then kernel could not shut down "processes" but this is not the case anymore. |