From patchwork Fri Apr 16 09:22:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42999 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D15B3955436; Fri, 16 Apr 2021 09:21:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D15B3955436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1618564916; bh=5OsiMISht+zltpSYTcE9z3kYxOv2Lvg4oaa/i0KvBjo=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=n/iGYoeYo9uxoVx7UDFXX4X2Be741jZb4ZP2uCJu15NVEBU9kINiYJhcKukYqsTkP /4uclrBsVA/QytEeoCBjQEU/w6far3+PRVg2iT+WT9nJk8ESncE+tfYTuKDlaI28Yz vs7wnmfNgDzGXQ5WDtgn7xXivuy+L4gKdBvGa3mc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 9440F3892016 for ; Fri, 16 Apr 2021 09:21:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9440F3892016 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-404-98s61Y4fPwytfdvUw1Fypw-1; Fri, 16 Apr 2021 05:21:48 -0400 X-MC-Unique: 98s61Y4fPwytfdvUw1Fypw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6772A107ACC7 for ; Fri, 16 Apr 2021 09:21:47 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42B305C8AA for ; Fri, 16 Apr 2021 09:21:46 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v4 16/37] nptl: Move pthread_setcancelstate into libc In-Reply-To: References: Message-Id: Date: Fri, 16 Apr 2021 11:22:03 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" No new symbol version is required because there was a forwarder. The symbol has been moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella --- libio/iopopen.c | 5 ++--- misc/error.c | 19 ++++++------------- nptl/Makefile | 2 +- nptl/Versions | 2 +- nptl/forward.c | 4 ---- nptl/nptl-init.c | 1 - nptl/pthreadP.h | 2 -- nptl/pthread_setcancelstate.c | 6 +++--- stdlib/fmtmsg.c | 9 ++------- sysdeps/nptl/libc-lockP.h | 4 +--- sysdeps/nptl/pthread-functions.h | 1 - sysdeps/posix/system.c | 5 ++--- .../sysv/linux/aarch64/libpthread.abilist | 1 - .../unix/sysv/linux/alpha/libpthread.abilist | 1 - .../unix/sysv/linux/arc/libpthread.abilist | 1 - .../unix/sysv/linux/arm/be/libpthread.abilist | 1 - .../unix/sysv/linux/arm/le/libpthread.abilist | 1 - .../unix/sysv/linux/csky/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/fatal-prepare.h | 4 +--- .../unix/sysv/linux/hppa/libpthread.abilist | 1 - .../unix/sysv/linux/i386/libpthread.abilist | 1 - .../unix/sysv/linux/ia64/libpthread.abilist | 1 - .../linux/m68k/coldfire/libpthread.abilist | 1 - .../sysv/linux/m68k/m680x0/libpthread.abilist | 1 - .../linux/microblaze/be/libpthread.abilist | 1 - .../linux/microblaze/le/libpthread.abilist | 1 - .../sysv/linux/mips/mips32/libpthread.abilist | 1 - .../sysv/linux/mips/mips64/libpthread.abilist | 1 - .../unix/sysv/linux/nios2/libpthread.abilist | 1 - .../powerpc/powerpc32/libpthread.abilist | 1 - .../powerpc/powerpc64/be/libpthread.abilist | 1 - .../powerpc/powerpc64/le/libpthread.abilist | 1 - .../sysv/linux/riscv/rv32/libpthread.abilist | 1 - .../sysv/linux/riscv/rv64/libpthread.abilist | 1 - .../linux/s390/s390-32/libpthread.abilist | 1 - .../linux/s390/s390-64/libpthread.abilist | 1 - .../unix/sysv/linux/sh/be/libpthread.abilist | 1 - .../unix/sysv/linux/sh/le/libpthread.abilist | 1 - .../linux/sparc/sparc32/libpthread.abilist | 1 - .../linux/sparc/sparc64/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/spawni.c | 5 ++--- .../sysv/linux/x86_64/64/libpthread.abilist | 1 - .../sysv/linux/x86_64/x32/libpthread.abilist | 1 - 43 files changed, 21 insertions(+), 77 deletions(-) diff --git a/libio/iopopen.c b/libio/iopopen.c index 3afca7e173..6b04222c24 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -282,10 +282,9 @@ _IO_new_proc_close (FILE *fp) do { int state; - __libc_ptf_call (__pthread_setcancelstate, - (PTHREAD_CANCEL_DISABLE, &state), 0); + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); wait_pid = __waitpid (((_IO_proc_file *) fp)->pid, &wstatus, 0); - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + __pthread_setcancelstate (state, NULL); } while (wait_pid == -1 && errno == EINTR); if (wait_pid == -1) diff --git a/misc/error.c b/misc/error.c index 06cc4a5028..0400c84df8 100644 --- a/misc/error.c +++ b/misc/error.c @@ -236,12 +236,11 @@ void __error_internal (int status, int errnum, const char *message, va_list args, unsigned int mode_flags) { -#if defined _LIBC && defined __libc_ptf_call +#if defined _LIBC /* We do not want this call to be cut short by a thread cancellation. Therefore disable cancellation for now. */ int state = PTHREAD_CANCEL_ENABLE; - __libc_ptf_call (__pthread_setcancelstate, - (PTHREAD_CANCEL_DISABLE, &state), 0); + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); #endif flush_stdout (); @@ -263,9 +262,7 @@ __error_internal (int status, int errnum, const char *message, #ifdef _LIBC _IO_funlockfile (stderr); -# ifdef __libc_ptf_call - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); -# endif + __pthread_setcancelstate (state, NULL); #endif } @@ -305,13 +302,11 @@ __error_at_line_internal (int status, int errnum, const char *file_name, old_line_number = line_number; } -#if defined _LIBC && defined __libc_ptf_call +#if defined _LIBC /* We do not want this call to be cut short by a thread cancellation. Therefore disable cancellation for now. */ int state = PTHREAD_CANCEL_ENABLE; - __libc_ptf_call (__pthread_setcancelstate, - (PTHREAD_CANCEL_DISABLE, &state), - 0); + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); #endif flush_stdout (); @@ -341,9 +336,7 @@ __error_at_line_internal (int status, int errnum, const char *file_name, #ifdef _LIBC _IO_funlockfile (stderr); -# ifdef __libc_ptf_call - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); -# endif + __pthread_setcancelstate (state, NULL); #endif } diff --git a/nptl/Makefile b/nptl/Makefile index 2df56df680..183b4f01c0 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -83,6 +83,7 @@ routines = \ pthread_mutex_consistent \ pthread_once \ pthread_self \ + pthread_setcancelstate \ pthread_setschedparam \ pthread_sigmask \ unwind \ @@ -186,7 +187,6 @@ libpthread-routines = \ pthread_rwlockattr_setpshared \ pthread_setaffinity \ pthread_setattr_default_np \ - pthread_setcancelstate \ pthread_setcanceltype \ pthread_setconcurrency \ pthread_setname \ diff --git a/nptl/Versions b/nptl/Versions index f563e3b6cf..1314efc344 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -122,6 +122,7 @@ libc { __pthread_force_elision; __pthread_getattr_default_np; __pthread_keys; + __pthread_setcancelstate; __pthread_unwind; } } @@ -172,7 +173,6 @@ libpthread { pthread_mutexattr_getkind_np; pthread_mutexattr_init; pthread_mutexattr_setkind_np; - pthread_setcancelstate; pthread_setcanceltype; pthread_setspecific; pthread_sigmask; diff --git a/nptl/forward.c b/nptl/forward.c index a4a377ba6a..ef4a17d39b 100644 --- a/nptl/forward.c +++ b/nptl/forward.c @@ -102,8 +102,4 @@ FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0) FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) -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) diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index 761294929c..1dd4c02bc0 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -84,7 +84,6 @@ static const struct pthread_functions pthread_functions = .ptr_pthread_mutex_init = __pthread_mutex_init, .ptr_pthread_mutex_lock = __pthread_mutex_lock, .ptr_pthread_mutex_unlock = __pthread_mutex_unlock, - .ptr___pthread_setcancelstate = __pthread_setcancelstate, .ptr_pthread_setcanceltype = __pthread_setcanceltype, .ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock, .ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock, diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index b99aae2bfe..9215a76b61 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -387,7 +387,6 @@ extern int __pthread_getschedparam (pthread_t thread_id, int *policy, struct sched_param *param); extern int __pthread_setschedparam (pthread_t thread_id, int policy, const struct sched_param *param); -extern int __pthread_setcancelstate (int state, int *oldstate); extern int __pthread_mutex_init (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr); extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); @@ -560,7 +559,6 @@ hidden_proto (__pthread_rwlock_unlock) hidden_proto (__pthread_key_create) hidden_proto (__pthread_getspecific) hidden_proto (__pthread_setspecific) -hidden_proto (__pthread_setcancelstate) hidden_proto (__pthread_testcancel) hidden_proto (__pthread_mutexattr_init) hidden_proto (__pthread_mutexattr_settype) diff --git a/nptl/pthread_setcancelstate.c b/nptl/pthread_setcancelstate.c index a0ffbd9338..e3696ca348 100644 --- a/nptl/pthread_setcancelstate.c +++ b/nptl/pthread_setcancelstate.c @@ -19,7 +19,7 @@ #include #include "pthreadP.h" #include - +#include int __pthread_setcancelstate (int state, int *oldstate) @@ -67,5 +67,5 @@ __pthread_setcancelstate (int state, int *oldstate) return 0; } -strong_alias (__pthread_setcancelstate, pthread_setcancelstate) -hidden_def (__pthread_setcancelstate) +libc_hidden_def (__pthread_setcancelstate) +weak_alias (__pthread_setcancelstate, pthread_setcancelstate) diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c index 2846d34012..428dad07ff 100644 --- a/stdlib/fmtmsg.c +++ b/stdlib/fmtmsg.c @@ -122,13 +122,10 @@ fmtmsg (long int classification, const char *label, int severity, return MM_NOTOK; } -#ifdef __libc_ptf_call /* We do not want this call to be cut short by a thread cancellation. Therefore disable cancellation for now. */ int state = PTHREAD_CANCEL_ENABLE; - __libc_ptf_call (__pthread_setcancelstate, - (PTHREAD_CANCEL_DISABLE, &state), 0); -#endif + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); __libc_lock_lock (lock); @@ -197,9 +194,7 @@ fmtmsg (long int classification, const char *label, int severity, __libc_lock_unlock (lock); -#ifdef __libc_ptf_call - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); -#endif + __pthread_setcancelstate (state, NULL); return result; } diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h index ca3edd0af1..441da222c2 100644 --- a/sysdeps/nptl/libc-lockP.h +++ b/sysdeps/nptl/libc-lockP.h @@ -333,7 +333,7 @@ extern int __pthread_atfork (void (*__prepare) (void), void (*__child) (void)); extern int __pthread_setcancelstate (int state, int *oldstate); - +libc_hidden_proto (__pthread_setcancelstate) /* Make the pthread functions weak so that we can elide them from single-threaded processes. */ @@ -359,7 +359,6 @@ weak_extern (__pthread_setspecific) weak_extern (__pthread_getspecific) weak_extern (__pthread_initialize) weak_extern (__pthread_atfork) -weak_extern (__pthread_setcancelstate) # else # pragma weak __pthread_mutex_init # pragma weak __pthread_mutex_destroy @@ -380,7 +379,6 @@ weak_extern (__pthread_setcancelstate) # pragma weak __pthread_getspecific # pragma weak __pthread_initialize # pragma weak __pthread_atfork -# pragma weak __pthread_setcancelstate # endif #endif diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h index 8f280b9c25..ca7673135d 100644 --- a/sysdeps/nptl/pthread-functions.h +++ b/sysdeps/nptl/pthread-functions.h @@ -46,7 +46,6 @@ struct pthread_functions const pthread_mutexattr_t *); int (*ptr_pthread_mutex_lock) (pthread_mutex_t *); int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *); - int (*ptr___pthread_setcancelstate) (int, int *); int (*ptr_pthread_setcanceltype) (int, int *); int (*ptr___pthread_rwlock_rdlock) (pthread_rwlock_t *); int (*ptr___pthread_rwlock_wrlock) (pthread_rwlock_t *); diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index 13c0662f90..48668fb392 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -82,10 +82,9 @@ cancel_handler (void *arg) __kill_noerrno (args->pid, SIGKILL); int state; - __libc_ptf_call (__pthread_setcancelstate, - (PTHREAD_CANCEL_DISABLE, &state), 0); + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); TEMP_FAILURE_RETRY (__waitpid (args->pid, NULL, 0)); - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + __pthread_setcancelstate (state, NULL); DO_LOCK (); if (SUB_REF () == 0) diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index e78455a0b7..79dc164acc 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -104,7 +104,6 @@ GLIBC_2.17 pthread_rwlockattr_init F GLIBC_2.17 pthread_rwlockattr_setkind_np F GLIBC_2.17 pthread_rwlockattr_setpshared F GLIBC_2.17 pthread_setaffinity_np F -GLIBC_2.17 pthread_setcancelstate F GLIBC_2.17 pthread_setcanceltype F GLIBC_2.17 pthread_setconcurrency F GLIBC_2.17 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 0656b865dd..ed55e02894 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F GLIBC_2.0 pthread_mutexattr_setkind_np F -GLIBC_2.0 pthread_setcancelstate F GLIBC_2.0 pthread_setcanceltype F GLIBC_2.0 pthread_setspecific F GLIBC_2.0 pthread_testcancel F diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index cb11a71396..2dbfe6d270 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -124,7 +124,6 @@ GLIBC_2.32 pthread_rwlockattr_setkind_np F GLIBC_2.32 pthread_rwlockattr_setpshared F GLIBC_2.32 pthread_setaffinity_np F GLIBC_2.32 pthread_setattr_default_np F -GLIBC_2.32 pthread_setcancelstate F GLIBC_2.32 pthread_setcanceltype F GLIBC_2.32 pthread_setconcurrency F GLIBC_2.32 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index 1b749ca6d0..77a88c356b 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -135,7 +135,6 @@ GLIBC_2.4 pthread_rwlockattr_init F GLIBC_2.4 pthread_rwlockattr_setkind_np F GLIBC_2.4 pthread_rwlockattr_setpshared F GLIBC_2.4 pthread_setaffinity_np F -GLIBC_2.4 pthread_setcancelstate F GLIBC_2.4 pthread_setcanceltype F GLIBC_2.4 pthread_setconcurrency F GLIBC_2.4 pthread_setschedprio F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index 1b749ca6d0..77a88c356b 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -135,7 +135,6 @@ GLIBC_2.4 pthread_rwlockattr_init F GLIBC_2.4 pthread_rwlockattr_setkind_np F GLIBC_2.4 pthread_rwlockattr_setpshared F GLIBC_2.4 pthread_setaffinity_np F -GLIBC_2.4 pthread_setcancelstate F GLIBC_2.4 pthread_setcanceltype F GLIBC_2.4 pthread_setconcurrency F GLIBC_2.4 pthread_setschedprio F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index 27b0798b96..4915435656 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -119,7 +119,6 @@ GLIBC_2.29 pthread_rwlockattr_setkind_np F GLIBC_2.29 pthread_rwlockattr_setpshared F GLIBC_2.29 pthread_setaffinity_np F GLIBC_2.29 pthread_setattr_default_np F -GLIBC_2.29 pthread_setcancelstate F GLIBC_2.29 pthread_setcanceltype F GLIBC_2.29 pthread_setconcurrency F GLIBC_2.29 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/sysdeps/unix/sysv/linux/fatal-prepare.h index ec441bdfbc..e2591c5447 100644 --- a/sysdeps/unix/sysv/linux/fatal-prepare.h +++ b/sysdeps/unix/sysv/linux/fatal-prepare.h @@ -19,6 +19,4 @@ /* We have to completely disable cancellation. assert() must not be a cancellation point but the implementation uses write() etc. */ -#define FATAL_PREPARE \ - __libc_ptf_call (__pthread_setcancelstate, \ - (PTHREAD_CANCEL_DISABLE, NULL), 0) +#define FATAL_PREPARE __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL) diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index 956f8d8662..cff48d589f 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_rwlockattr_getpshared F GLIBC_2.2 pthread_rwlockattr_init F GLIBC_2.2 pthread_rwlockattr_setkind_np F GLIBC_2.2 pthread_rwlockattr_setpshared F -GLIBC_2.2 pthread_setcancelstate F GLIBC_2.2 pthread_setcanceltype F GLIBC_2.2 pthread_setconcurrency F GLIBC_2.2 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index 97c321b350..63e48bd909 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F GLIBC_2.0 pthread_mutexattr_setkind_np F -GLIBC_2.0 pthread_setcancelstate F GLIBC_2.0 pthread_setcanceltype F GLIBC_2.0 pthread_setspecific F GLIBC_2.0 pthread_testcancel F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index b9a05d7d5c..d2ac2d943d 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_rwlockattr_getpshared F GLIBC_2.2 pthread_rwlockattr_init F GLIBC_2.2 pthread_rwlockattr_setkind_np F GLIBC_2.2 pthread_rwlockattr_setpshared F -GLIBC_2.2 pthread_setcancelstate F GLIBC_2.2 pthread_setcanceltype F GLIBC_2.2 pthread_setconcurrency F GLIBC_2.2 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index 1b749ca6d0..77a88c356b 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -135,7 +135,6 @@ GLIBC_2.4 pthread_rwlockattr_init F GLIBC_2.4 pthread_rwlockattr_setkind_np F GLIBC_2.4 pthread_rwlockattr_setpshared F GLIBC_2.4 pthread_setaffinity_np F -GLIBC_2.4 pthread_setcancelstate F GLIBC_2.4 pthread_setcanceltype F GLIBC_2.4 pthread_setconcurrency F GLIBC_2.4 pthread_setschedprio F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index 97c321b350..63e48bd909 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F GLIBC_2.0 pthread_mutexattr_setkind_np F -GLIBC_2.0 pthread_setcancelstate F GLIBC_2.0 pthread_setcanceltype F GLIBC_2.0 pthread_setspecific F GLIBC_2.0 pthread_testcancel F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index 09ce35e05e..bb73a39ead 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -106,7 +106,6 @@ GLIBC_2.18 pthread_rwlockattr_setkind_np F GLIBC_2.18 pthread_rwlockattr_setpshared F GLIBC_2.18 pthread_setaffinity_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.18 pthread_setcancelstate F GLIBC_2.18 pthread_setcanceltype F GLIBC_2.18 pthread_setconcurrency F GLIBC_2.18 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index 09ce35e05e..bb73a39ead 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -106,7 +106,6 @@ GLIBC_2.18 pthread_rwlockattr_setkind_np F GLIBC_2.18 pthread_rwlockattr_setpshared F GLIBC_2.18 pthread_setaffinity_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.18 pthread_setcancelstate F GLIBC_2.18 pthread_setcanceltype F GLIBC_2.18 pthread_setconcurrency F GLIBC_2.18 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index 86b0cc4745..76ff31a4c2 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F GLIBC_2.0 pthread_mutexattr_setkind_np F -GLIBC_2.0 pthread_setcancelstate F GLIBC_2.0 pthread_setcanceltype F GLIBC_2.0 pthread_setspecific F GLIBC_2.0 pthread_testcancel F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index 86b0cc4745..76ff31a4c2 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F GLIBC_2.0 pthread_mutexattr_setkind_np F -GLIBC_2.0 pthread_setcancelstate F GLIBC_2.0 pthread_setcanceltype F GLIBC_2.0 pthread_setspecific F GLIBC_2.0 pthread_testcancel F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index 5a999ffa62..e1150a6598 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -106,7 +106,6 @@ GLIBC_2.21 pthread_rwlockattr_setkind_np F GLIBC_2.21 pthread_rwlockattr_setpshared F GLIBC_2.21 pthread_setaffinity_np F GLIBC_2.21 pthread_setattr_default_np F -GLIBC_2.21 pthread_setcancelstate F GLIBC_2.21 pthread_setcanceltype F GLIBC_2.21 pthread_setconcurrency F GLIBC_2.21 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index 0984b83366..22435d4db4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F GLIBC_2.0 pthread_mutexattr_setkind_np F -GLIBC_2.0 pthread_setcancelstate F GLIBC_2.0 pthread_setcanceltype F GLIBC_2.0 pthread_setspecific F GLIBC_2.0 pthread_testcancel F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index 6ae5f446b2..f36953cf6a 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -112,7 +112,6 @@ GLIBC_2.3 pthread_rwlockattr_getpshared F GLIBC_2.3 pthread_rwlockattr_init F GLIBC_2.3 pthread_rwlockattr_setkind_np F GLIBC_2.3 pthread_rwlockattr_setpshared F -GLIBC_2.3 pthread_setcancelstate F GLIBC_2.3 pthread_setcanceltype F GLIBC_2.3 pthread_setconcurrency F GLIBC_2.3 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index e78455a0b7..79dc164acc 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -104,7 +104,6 @@ GLIBC_2.17 pthread_rwlockattr_init F GLIBC_2.17 pthread_rwlockattr_setkind_np F GLIBC_2.17 pthread_rwlockattr_setpshared F GLIBC_2.17 pthread_setaffinity_np F -GLIBC_2.17 pthread_setcancelstate F GLIBC_2.17 pthread_setcanceltype F GLIBC_2.17 pthread_setconcurrency F GLIBC_2.17 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist index 9b9cc7567d..de39822207 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist @@ -124,7 +124,6 @@ GLIBC_2.33 pthread_rwlockattr_setkind_np F GLIBC_2.33 pthread_rwlockattr_setpshared F GLIBC_2.33 pthread_setaffinity_np F GLIBC_2.33 pthread_setattr_default_np F -GLIBC_2.33 pthread_setcancelstate F GLIBC_2.33 pthread_setcanceltype F GLIBC_2.33 pthread_setconcurrency F GLIBC_2.33 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index 9e902b5bc4..0c576328d3 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -106,7 +106,6 @@ GLIBC_2.27 pthread_rwlockattr_setkind_np F GLIBC_2.27 pthread_rwlockattr_setpshared F GLIBC_2.27 pthread_setaffinity_np F GLIBC_2.27 pthread_setattr_default_np F -GLIBC_2.27 pthread_setcancelstate F GLIBC_2.27 pthread_setcanceltype F GLIBC_2.27 pthread_setconcurrency F GLIBC_2.27 pthread_setname_np F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index e5e82fb329..7d08398bf4 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F GLIBC_2.0 pthread_mutexattr_setkind_np F -GLIBC_2.0 pthread_setcancelstate F GLIBC_2.0 pthread_setcanceltype F GLIBC_2.0 pthread_setspecific F GLIBC_2.0 pthread_testcancel F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index d6fb24cb91..caeec6178a 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -93,7 +93,6 @@ GLIBC_2.2 pthread_rwlockattr_getpshared F GLIBC_2.2 pthread_rwlockattr_init F GLIBC_2.2 pthread_rwlockattr_setkind_np F GLIBC_2.2 pthread_rwlockattr_setpshared F -GLIBC_2.2 pthread_setcancelstate F GLIBC_2.2 pthread_setcanceltype F GLIBC_2.2 pthread_setconcurrency F GLIBC_2.2 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index 956f8d8662..cff48d589f 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_rwlockattr_getpshared F GLIBC_2.2 pthread_rwlockattr_init F GLIBC_2.2 pthread_rwlockattr_setkind_np F GLIBC_2.2 pthread_rwlockattr_setpshared F -GLIBC_2.2 pthread_setcancelstate F GLIBC_2.2 pthread_setcanceltype F GLIBC_2.2 pthread_setconcurrency F GLIBC_2.2 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index 956f8d8662..cff48d589f 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_rwlockattr_getpshared F GLIBC_2.2 pthread_rwlockattr_init F GLIBC_2.2 pthread_rwlockattr_setkind_np F GLIBC_2.2 pthread_rwlockattr_setpshared F -GLIBC_2.2 pthread_setcancelstate F GLIBC_2.2 pthread_setcanceltype F GLIBC_2.2 pthread_setconcurrency F GLIBC_2.2 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index 0656b865dd..ed55e02894 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F GLIBC_2.0 pthread_mutexattr_setkind_np F -GLIBC_2.0 pthread_setcancelstate F GLIBC_2.0 pthread_setcanceltype F GLIBC_2.0 pthread_setspecific F GLIBC_2.0 pthread_testcancel F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index b9a05d7d5c..d2ac2d943d 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_rwlockattr_getpshared F GLIBC_2.2 pthread_rwlockattr_init F GLIBC_2.2 pthread_rwlockattr_setkind_np F GLIBC_2.2 pthread_rwlockattr_setpshared F -GLIBC_2.2 pthread_setcancelstate F GLIBC_2.2 pthread_setcanceltype F GLIBC_2.2 pthread_setconcurrency F GLIBC_2.2 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index b53b81b8fc..501f8fbccd 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -354,8 +354,7 @@ __spawnix (pid_t * pid, const char *file, /* Disable asynchronous cancellation. */ int state; - __libc_ptf_call (__pthread_setcancelstate, - (PTHREAD_CANCEL_DISABLE, &state), 0); + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); /* Child must set args.err to something non-negative - we rely on the parent and child sharing VM. */ @@ -413,7 +412,7 @@ __spawnix (pid_t * pid, const char *file, __libc_signal_restore_set (&args.oldmask); - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + __pthread_setcancelstate (state, NULL); return ec; } diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 0a0845518e..7a645ca9ed 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -92,7 +92,6 @@ GLIBC_2.2.5 pthread_rwlockattr_getpshared F GLIBC_2.2.5 pthread_rwlockattr_init F GLIBC_2.2.5 pthread_rwlockattr_setkind_np F GLIBC_2.2.5 pthread_rwlockattr_setpshared F -GLIBC_2.2.5 pthread_setcancelstate F GLIBC_2.2.5 pthread_setcanceltype F GLIBC_2.2.5 pthread_setconcurrency F GLIBC_2.2.5 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index e052b94eb3..52cef520d6 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -104,7 +104,6 @@ GLIBC_2.16 pthread_rwlockattr_init F GLIBC_2.16 pthread_rwlockattr_setkind_np F GLIBC_2.16 pthread_rwlockattr_setpshared F GLIBC_2.16 pthread_setaffinity_np F -GLIBC_2.16 pthread_setcancelstate F GLIBC_2.16 pthread_setcanceltype F GLIBC_2.16 pthread_setconcurrency F GLIBC_2.16 pthread_setname_np F