nptl: Move pthread_kill_other_threads_np compatibility symbol into libc

And stop including the function for new architectures.

64 files changed, 35 insertions, 33 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.
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 895b7e2dfb..33aea8b394 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1464,6 +1464,7 @@ GLIBC_2.17 pthread_getspecific F
 GLIBC_2.17 pthread_key_create F
 GLIBC_2.17 pthread_key_delete F
 GLIBC_2.17 pthread_kill F
+GLIBC_2.17 pthread_kill_other_threads_np F
 GLIBC_2.17 pthread_mutex_consistent F
 GLIBC_2.17 pthread_mutex_consistent_np F
 GLIBC_2.17 pthread_mutex_destroy F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 314853be09..2f45da8034 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -46,7 +46,6 @@ GLIBC_2.17 pthread_getconcurrency F
 GLIBC_2.17 pthread_getcpuclockid F
 GLIBC_2.17 pthread_getname_np F
 GLIBC_2.17 pthread_join F
-GLIBC_2.17 pthread_kill_other_threads_np F
 GLIBC_2.17 pthread_mutex_getprioceiling F
 GLIBC_2.17 pthread_mutex_setprioceiling F
 GLIBC_2.17 pthread_mutex_timedlock F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index c985c1fd19..164c3528f9 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -900,6 +900,7 @@ GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_key_create F
 GLIBC_2.0 pthread_key_delete F
 GLIBC_2.0 pthread_kill F
+GLIBC_2.0 pthread_kill_other_threads_np F
 GLIBC_2.0 pthread_mutex_destroy F
 GLIBC_2.0 pthread_mutex_init F
 GLIBC_2.0 pthread_mutex_lock F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 4671ccced8..ef8ad2fac4 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -14,7 +14,6 @@ GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 pthread_kill_other_threads_np F
 GLIBC_2.0 pthread_mutex_trylock F
 GLIBC_2.0 pthread_mutexattr_destroy F
 GLIBC_2.0 pthread_mutexattr_getkind_np F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 9711f7f0d4..2622a3ad47 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1391,6 +1391,7 @@ GLIBC_2.32 pthread_getspecific F
 GLIBC_2.32 pthread_key_create F
 GLIBC_2.32 pthread_key_delete F
 GLIBC_2.32 pthread_kill F
+GLIBC_2.32 pthread_kill_other_threads_np F
 GLIBC_2.32 pthread_mutex_consistent F
 GLIBC_2.32 pthread_mutex_consistent_np F
 GLIBC_2.32 pthread_mutex_destroy F
diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
index 6dd52df995..7cc7a0b8c7 100644
--- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
@@ -61,7 +61,6 @@ GLIBC_2.32 pthread_getconcurrency F
 GLIBC_2.32 pthread_getcpuclockid F
 GLIBC_2.32 pthread_getname_np F
 GLIBC_2.32 pthread_join F
-GLIBC_2.32 pthread_kill_other_threads_np F
 GLIBC_2.32 pthread_mutex_clocklock F
 GLIBC_2.32 pthread_mutex_getprioceiling F
 GLIBC_2.32 pthread_mutex_setprioceiling F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index e1debf1ae0..d4c3afd6d6 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -1579,6 +1579,7 @@ GLIBC_2.4 pthread_getspecific F
 GLIBC_2.4 pthread_key_create F
 GLIBC_2.4 pthread_key_delete F
 GLIBC_2.4 pthread_kill F
+GLIBC_2.4 pthread_kill_other_threads_np F
 GLIBC_2.4 pthread_mutex_consistent_np F
 GLIBC_2.4 pthread_mutex_destroy F
 GLIBC_2.4 pthread_mutex_init F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 5fcc5e5af3..27cf00037d 100644
--- a/sysdeps/unix/sysv/linux/arm/be/lib