qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

htl: move pthread_setcanceltype into libc. 

Message-ID: <20250103103750.870897-7-gfleury@disroot.org>
This commit is contained in:
gfleury 2025-01-03 12:37:50 +02:00 committed by Samuel Thibault
parent 265c5991af
commit 9a31eb64db
10 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htl/Makefile
View File

@ -51,7 +51,6 @@ libpthread-routines := \
pt-spin-inlines \ pt-spin-inlines \
pt-cleanup \ pt-cleanup \
pt-setcancelstate \ pt-setcancelstate \
pt-setcanceltype \
pt-testcancel \ pt-testcancel \
pt-cancel \ pt-cancel \
pt-mutex-transfer-np \ pt-mutex-transfer-np \
@ -204,6 +203,7 @@ routines := \
pt-nthreads \ pt-nthreads \
pt-pthread_self \ pt-pthread_self \
pt-self pt-equal \ pt-self pt-equal \
pt-setcanceltype \
pt-setschedparam \ pt-setschedparam \
pt-sigmask \ pt-sigmask \
pt-sigstate \ pt-sigstate \

3
htl/Versions
View File

@ -56,6 +56,7 @@ libc {
pthread_mutexattr_setprotocol; pthread_mutexattr_setprotocol;
pthread_mutexattr_setpshared; pthread_mutexattr_setpshared;
pthread_mutexattr_settype; pthread_mutexattr_settype;
pthread_setcanceltype;
pthread_sigmask; pthread_sigmask;
} }
@ -231,7 +232,7 @@ libpthread {
pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared;
pthread_rwlockattr_init; pthread_rwlockattr_setpshared; pthread_rwlockattr_init; pthread_rwlockattr_setpshared;
pthread_setcancelstate; pthread_setcanceltype; pthread_setcancelstate;
pthread_setconcurrency; pthread_setconcurrency;
pthread_setschedprio; pthread_setspecific; pthread_setschedprio; pthread_setspecific;

2
htl/forward.c
View File

@ -62,7 +62,5 @@ FORWARD (__pthread_setcancelstate, (int state, int *oldstate),
(state, oldstate), 0) (state, oldstate), 0)
strong_alias (__pthread_setcancelstate, pthread_setcancelstate); strong_alias (__pthread_setcancelstate, pthread_setcancelstate);
FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
FORWARD2 (__pthread_get_cleanup_stack, struct __pthread_cancelation_handler **, FORWARD2 (__pthread_get_cleanup_stack, struct __pthread_cancelation_handler **,
(void), (), return &__pthread_cleanup_stack); (void), (), return &__pthread_cleanup_stack);

1
htl/pt-initialize.c
View File

@ -29,7 +29,6 @@
static const struct pthread_functions pthread_functions = { static const struct pthread_functions pthread_functions = {
.ptr___pthread_exit = __pthread_exit, .ptr___pthread_exit = __pthread_exit,
.ptr___pthread_setcancelstate = __pthread_setcancelstate, .ptr___pthread_setcancelstate = __pthread_setcancelstate,
.ptr_pthread_setcanceltype = __pthread_setcanceltype,
.ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack, .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack,
.ptr_pthread_once = __pthread_once, .ptr_pthread_once = __pthread_once,
.ptr_pthread_rwlock_rdlock = __pthread_rwlock_rdlock, .ptr_pthread_rwlock_rdlock = __pthread_rwlock_rdlock,

8
htl/pt-setcanceltype.c
View File

@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <pthread.h> #include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h> #include <pt-internal.h>
int int
@ -42,5 +42,9 @@ __pthread_setcanceltype (int type, int *oldtype)
return 0; return 0;
} }
libc_hidden_def (__pthread_setcanceltype)
versioned_symbol (libc, __pthread_setcanceltype, pthread_setcanceltype, GLIBC_2_21);
weak_alias (__pthread_setcanceltype, pthread_setcanceltype); #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_setcanceltype, pthread_setcanceltype, GLIBC_2_12);
#endif

2
sysdeps/htl/pthread-functions.h
View File

@ -23,7 +23,6 @@
void __pthread_exit (void *) __attribute__ ((__noreturn__)); void __pthread_exit (void *) __attribute__ ((__noreturn__));
int __pthread_setcancelstate (int, int *); int __pthread_setcancelstate (int, int *);
int __pthread_setcanceltype (int, int *);
struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void); struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
int __pthread_once (pthread_once_t *, void (*) (void)); int __pthread_once (pthread_once_t *, void (*) (void));
int __pthread_rwlock_rdlock (pthread_rwlock_t *); int __pthread_rwlock_rdlock (pthread_rwlock_t *);
@ -44,7 +43,6 @@ struct pthread_functions
{ {
void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__)); void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
int (*ptr___pthread_setcancelstate) (int, int *); int (*ptr___pthread_setcancelstate) (int, int *);
int (*ptr_pthread_setcanceltype) (int, int *);
struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void); struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void);
int (*ptr_pthread_once) (pthread_once_t *, void (*) (void)); int (*ptr_pthread_once) (pthread_once_t *, void (*) (void));
int (*ptr_pthread_rwlock_rdlock) (pthread_rwlock_t *); int (*ptr_pthread_rwlock_rdlock) (pthread_rwlock_t *);

3
sysdeps/htl/pthreadP.h
View File

@ -118,6 +118,9 @@ extern int __pthread_cond_clockwait (pthread_cond_t *cond,
libc_hidden_proto (__pthread_cond_clockwait); libc_hidden_proto (__pthread_cond_clockwait);
extern int __pthread_cond_destroy (pthread_cond_t *cond); extern int __pthread_cond_destroy (pthread_cond_t *cond);
libc_hidden_proto (__pthread_cond_destroy); libc_hidden_proto (__pthread_cond_destroy);
extern int __pthread_setcanceltype (int __type, int *__oldtype);
libc_hidden_proto (__pthread_setcanceltype);
extern int __pthread_sigmask (int, const sigset_t *, sigset_t *); extern int __pthread_sigmask (int, const sigset_t *, sigset_t *);
libc_hidden_proto (__pthread_sigmask); libc_hidden_proto (__pthread_sigmask);

1
sysdeps/mach/hurd/i386/libc.abilist
View File

@ -82,6 +82,7 @@ GLIBC_2.12 pthread_mutexattr_setprotocol F
GLIBC_2.12 pthread_mutexattr_setpshared F GLIBC_2.12 pthread_mutexattr_setpshared F
GLIBC_2.12 pthread_mutexattr_settype F GLIBC_2.12 pthread_mutexattr_settype F
GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_self F
GLIBC_2.12 pthread_setcanceltype F
GLIBC_2.12 pthread_setschedparam F GLIBC_2.12 pthread_setschedparam F
GLIBC_2.12 pthread_sigmask F GLIBC_2.12 pthread_sigmask F
GLIBC_2.13 __fentry__ F GLIBC_2.13 __fentry__ F

1
sysdeps/mach/hurd/i386/libpthread.abilist
View File

@ -57,7 +57,6 @@ GLIBC_2.12 pthread_rwlockattr_getpshared F
GLIBC_2.12 pthread_rwlockattr_init F GLIBC_2.12 pthread_rwlockattr_init F
GLIBC_2.12 pthread_rwlockattr_setpshared F GLIBC_2.12 pthread_rwlockattr_setpshared F
GLIBC_2.12 pthread_setcancelstate F GLIBC_2.12 pthread_setcancelstate F
GLIBC_2.12 pthread_setcanceltype F
GLIBC_2.12 pthread_setconcurrency F GLIBC_2.12 pthread_setconcurrency F
GLIBC_2.12 pthread_setschedprio F GLIBC_2.12 pthread_setschedprio F
GLIBC_2.12 pthread_setspecific F GLIBC_2.12 pthread_setspecific F

1
sysdeps/mach/hurd/x86_64/libpthread.abilist
View File

@ -79,7 +79,6 @@ GLIBC_2.38 pthread_rwlockattr_getpshared F
GLIBC_2.38 pthread_rwlockattr_init F GLIBC_2.38 pthread_rwlockattr_init F
GLIBC_2.38 pthread_rwlockattr_setpshared F GLIBC_2.38 pthread_rwlockattr_setpshared F
GLIBC_2.38 pthread_setcancelstate F GLIBC_2.38 pthread_setcancelstate F
GLIBC_2.38 pthread_setcanceltype F
GLIBC_2.38 pthread_setconcurrency F GLIBC_2.38 pthread_setconcurrency F
GLIBC_2.38 pthread_setschedprio F GLIBC_2.38 pthread_setschedprio F
GLIBC_2.38 pthread_setspecific F GLIBC_2.38 pthread_setspecific F