diff options
Diffstat (limited to 'htl')
| -rw-r--r-- | htl/Makefile | 2 | ||||
| -rw-r--r-- | htl/Versions | 3 | ||||
| -rw-r--r-- | htl/forward.c | 2 | ||||
| -rw-r--r-- | htl/pt-initialize.c | 1 | ||||
| -rw-r--r-- | htl/pt-setcanceltype.c | 8 |
5 files changed, 9 insertions, 7 deletions
diff --git a/htl/Makefile b/htl/Makefile index 5b0b6023b0..d4418ab9f9 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -51,7 +51,6 @@ libpthread-routines := \ pt-spin-inlines \ pt-cleanup \ pt-setcancelstate \ - pt-setcanceltype \ pt-testcancel \ pt-cancel \ pt-mutex-transfer-np \ @@ -204,6 +203,7 @@ routines := \ pt-nthreads \ pt-pthread_self \ pt-self pt-equal \ + pt-setcanceltype \ pt-setschedparam \ pt-sigmask \ pt-sigstate \ diff --git a/htl/Versions b/htl/Versions index 2ebf554cfa..6801d12182 100644 --- a/htl/Versions +++ b/htl/Versions @@ -56,6 +56,7 @@ libc { pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; + pthread_setcanceltype; pthread_sigmask; } @@ -231,7 +232,7 @@ libpthread { pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; pthread_rwlockattr_setpshared; - pthread_setcancelstate; pthread_setcanceltype; + pthread_setcancelstate; pthread_setconcurrency; pthread_setschedprio; pthread_setspecific; diff --git a/htl/forward.c b/htl/forward.c index 636902919e..9455df7316 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -62,7 +62,5 @@ FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), 0) 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 **, (void), (), return &__pthread_cleanup_stack); diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 5854bc4967..eba9e12d73 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -29,7 +29,6 @@ static const struct pthread_functions pthread_functions = { .ptr___pthread_exit = __pthread_exit, .ptr___pthread_setcancelstate = __pthread_setcancelstate, - .ptr_pthread_setcanceltype = __pthread_setcanceltype, .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack, .ptr_pthread_once = __pthread_once, .ptr_pthread_rwlock_rdlock = __pthread_rwlock_rdlock, diff --git a/htl/pt-setcanceltype.c b/htl/pt-setcanceltype.c index f9474f9c39..0b76fbfbd6 100644 --- a/htl/pt-setcanceltype.c +++ b/htl/pt-setcanceltype.c @@ -17,7 +17,7 @@ <https://www.gnu.org/licenses/>. */ #include <pthread.h> - +#include <shlib-compat.h> #include <pt-internal.h> int @@ -42,5 +42,9 @@ __pthread_setcanceltype (int type, int *oldtype) 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 |