From: gfleury <[email protected]>
Message-ID: <[email protected]>
---
htl/Makefile | 2 +-
htl/Versions | 6 +++---
sysdeps/hurd/htl/pt-kill.c | 9 ++++++++-
sysdeps/mach/hurd/i386/libc.abilist | 3 +++
sysdeps/mach/hurd/i386/libpthread.abilist | 2 --
sysdeps/mach/hurd/x86_64/libc.abilist | 3 +++
sysdeps/mach/hurd/x86_64/libpthread.abilist | 2 --
7 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/htl/Makefile b/htl/Makefile
index 3ec68aa842..0acd3a8868 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -41,7 +41,6 @@ libpthread-routines := \
pt-setup \
pt-spin \
pt-sigstate-init \
- pt-kill \
pt-getname-np \
pt-setname-np \
sem_close \
@@ -153,6 +152,7 @@ routines := \
pt-init-specific \
pt-key-create \
pt-key-delete \
+ pt-kill \
pt-machdep \
pt-mutex-checklocked \
pt-mutex-consistent \
diff --git a/htl/Versions b/htl/Versions
index 078aa8b33a..06977e677b 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -4,6 +4,7 @@ libc {
pthread_self;
__pthread_get_cleanup_stack;
__pthread_key_create;
+ __pthread_kill;
__pthread_self;
pthread_attr_getdetachstate;
pthread_attr_getinheritsched;
@@ -53,6 +54,7 @@ libc {
pthread_getconcurrency;
pthread_key_create;
pthread_key_delete;
+ pthread_kill;
pthread_mutex_destroy;
pthread_mutex_getprioceiling;
pthread_mutex_init;
@@ -196,6 +198,7 @@ libc {
pthread_cancel;
pthread_getconcurrency;
pthread_getcpuclockid;
+ pthread_kill;
pthread_setconcurrency;
pthread_setschedprio;
pthread_yield;
@@ -291,9 +294,6 @@ libpthread {
pthread_join;
- pthread_kill;
- __pthread_kill;
-
pthread_mutex_transfer_np;
pthread_testcancel;
diff --git a/sysdeps/hurd/htl/pt-kill.c b/sysdeps/hurd/htl/pt-kill.c
index 77be247f2b..f3a283f284 100644
--- a/sysdeps/hurd/htl/pt-kill.c
+++ b/sysdeps/hurd/htl/pt-kill.c
@@ -22,6 +22,8 @@
#include <hurd/signal.h>
#include <pt-internal.h>
+#include <shlib-compat.h>
+#include <ldsodefs.h>
int
__pthread_kill (pthread_t thread, int sig)
@@ -52,4 +54,9 @@ __pthread_kill (pthread_t thread, int sig)
__spin_lock (&ss->lock);
return _hurd_raise_signal (ss, sig, &detail);
}
-strong_alias (__pthread_kill, pthread_kill)
+
+versioned_symbol (libc, __pthread_kill, pthread_kill, GLIBC_2_43);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libpthread, __pthread_kill, pthread_kill, GLIBC_2_12);
+#endif
diff --git a/sysdeps/mach/hurd/i386/libc.abilist
b/sysdeps/mach/hurd/i386/libc.abilist
index 1128ca2496..6056958fcd 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -30,6 +30,7 @@ GLIBC_2.11 mkstemps F
GLIBC_2.11 mkstemps64 F
GLIBC_2.12 __pthread_get_cleanup_stack F
GLIBC_2.12 __pthread_key_create F
+GLIBC_2.12 __pthread_kill F
GLIBC_2.12 __pthread_self F
GLIBC_2.12 pthread_attr_destroy F
GLIBC_2.12 pthread_attr_getdetachstate F
@@ -78,6 +79,7 @@ GLIBC_2.12 pthread_getschedparam F
GLIBC_2.12 pthread_getspecific F
GLIBC_2.12 pthread_key_create F
GLIBC_2.12 pthread_key_delete F
+GLIBC_2.12 pthread_kill F
GLIBC_2.12 pthread_mutex_destroy F
GLIBC_2.12 pthread_mutex_getprioceiling F
GLIBC_2.12 pthread_mutex_init F
@@ -2642,6 +2644,7 @@ GLIBC_2.42 ullabs F
GLIBC_2.43 pthread_cancel F
GLIBC_2.43 pthread_getconcurrency F
GLIBC_2.43 pthread_getcpuclockid F
+GLIBC_2.43 pthread_kill F
GLIBC_2.43 pthread_setconcurrency F
GLIBC_2.43 pthread_setschedprio F
GLIBC_2.43 pthread_yield F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist
b/sysdeps/mach/hurd/i386/libpthread.abilist
index 3c7c8d9398..afb9e6064d 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -1,6 +1,5 @@
GLIBC_2.12 __mutex_lock_solid F
GLIBC_2.12 __mutex_unlock_solid F
-GLIBC_2.12 __pthread_kill F
GLIBC_2.12 __pthread_mutex_transfer_np F
GLIBC_2.12 __pthread_spin_destroy F
GLIBC_2.12 __pthread_spin_init F
@@ -25,7 +24,6 @@ GLIBC_2.12 pthread_detach F
GLIBC_2.12 pthread_exit F
GLIBC_2.12 pthread_getattr_np F
GLIBC_2.12 pthread_join F
-GLIBC_2.12 pthread_kill F
GLIBC_2.12 pthread_mutex_transfer_np F
GLIBC_2.12 pthread_spin_destroy F
GLIBC_2.12 pthread_spin_init F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist
b/sysdeps/mach/hurd/x86_64/libc.abilist
index 8b5d0c8871..b17e1980b5 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -393,6 +393,7 @@ GLIBC_2.38 __progname D 0x8
GLIBC_2.38 __progname_full D 0x8
GLIBC_2.38 __pthread_get_cleanup_stack F
GLIBC_2.38 __pthread_key_create F
+GLIBC_2.38 __pthread_kill F
GLIBC_2.38 __pthread_self F
GLIBC_2.38 __ptsname_r_chk F
GLIBC_2.38 __pwrite64 F
@@ -1561,6 +1562,7 @@ GLIBC_2.38 pthread_getschedparam F
GLIBC_2.38 pthread_getspecific F
GLIBC_2.38 pthread_key_create F
GLIBC_2.38 pthread_key_delete F
+GLIBC_2.38 pthread_kill F
GLIBC_2.38 pthread_mutex_clocklock F
GLIBC_2.38 pthread_mutex_consistent F
GLIBC_2.38 pthread_mutex_consistent_np F
@@ -2324,6 +2326,7 @@ GLIBC_2.42 ullabs F
GLIBC_2.43 pthread_cancel F
GLIBC_2.43 pthread_getconcurrency F
GLIBC_2.43 pthread_getcpuclockid F
+GLIBC_2.43 pthread_kill F
GLIBC_2.43 pthread_setconcurrency F
GLIBC_2.43 pthread_setschedprio F
GLIBC_2.43 pthread_yield F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist
b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index f8d7ee6bfd..f1fef475ad 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -5,7 +5,6 @@ GLIBC_2.38 __errno_location F
GLIBC_2.38 __h_errno_location F
GLIBC_2.38 __mutex_lock_solid F
GLIBC_2.38 __mutex_unlock_solid F
-GLIBC_2.38 __pthread_kill F
GLIBC_2.38 __pthread_mutex_transfer_np F
GLIBC_2.38 __pthread_spin_destroy F
GLIBC_2.38 __pthread_spin_init F
@@ -45,7 +44,6 @@ GLIBC_2.38 pthread_getattr_np F
GLIBC_2.38 pthread_hurd_cond_timedwait_np F
GLIBC_2.38 pthread_hurd_cond_wait_np F
GLIBC_2.38 pthread_join F
-GLIBC_2.38 pthread_kill F
GLIBC_2.38 pthread_mutex_transfer_np F
GLIBC_2.38 pthread_spin_destroy F
GLIBC_2.38 pthread_spin_init F
--
2.47.2
