From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by sourceware.org (Postfix) with ESMTPS id 8849C385781F for ; Thu, 18 Mar 2021 12:53:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8849C385781F Received: by mail-qk1-x72c.google.com with SMTP id l132so1793156qke.7 for ; Thu, 18 Mar 2021 05:53:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=l93UXlm1Tw3qCm/vRWDrHeamwLyHmEc8P68fSY0Upm4=; b=T+ML5OI6W/f6tieE5yi2jm5VgLfTJ5tbiLmtOQSjCPFcTKRT83j2ZkHIFzSAgptY0I cBcx/ABPTFcrZ/IGLskamSVEd2xqhsbU/TswlLmWAKOFny5UYyn3gBR185TsUwc7Iy2D jo1bbNWIBgM0hjDjTChb+ugGIl3X1YUR7Gxt5slN1K1z+iMUYBzCBlyeWY1GM/f4m9HX HmamuKnMvGfpTyCoobFb5l6X8Ra83K7ltkGmF8L/w/kvnQKo/iRDG7RELUurG5uHTX/Q n45k13U78XUkR8OdAQCaYZy1SVEWvsZfaTvsCeahnpPSJTNSWuSjwqwrv7zS00R292Yw aBxQ== X-Gm-Message-State: AOAM531Y/NNffj7qUw+INxsrLhQXJo0pNHFP7JIdkNmlAvaWtcGPktI7 PpSso/tqxxU7i6W6JrMud0Q+57/6jQD+rV4r X-Google-Smtp-Source: ABdhPJyfI/DrAixGmKaBG98uxhfr25WFUTct0oR3EfEe9SeorDjPQCBWaPwWnE8qbP2WlVrfU373Jg== X-Received: by 2002:a05:620a:806:: with SMTP id s6mr3972219qks.50.1616072027818; Thu, 18 Mar 2021 05:53:47 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id i8sm1310365qtj.16.2021.03.18.05.53.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Mar 2021 05:53:47 -0700 (PDT) Subject: Re: [PATCH v3 17/37] nptl: Move pthread_setcanceltype into libc To: Florian Weimer , libc-alpha@sourceware.org References: <810c78552284be170d5a994075977fc561a52204.1615914632.git.fweimer@redhat.com> From: Adhemerval Zanella Message-ID: Date: Thu, 18 Mar 2021 09:53:45 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <810c78552284be170d5a994075977fc561a52204.1615914632.git.fweimer@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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-List-Received-Date: Thu, 18 Mar 2021 12:53:51 -0000 On 16/03/2021 14:29, Florian Weimer via Libc-alpha wrote: > No new symbol version is required because there was a forwarder. > > The symbol has been moved using scripts/move-symbol-to-libc.py. LGTM. Reviewed-by: Adhemerval Zanella > --- > nptl/Makefile | 2 +- > nptl/Versions | 1 - > nptl/forward.c | 2 -- > nptl/nptl-init.c | 1 - > nptl/pthreadP.h | 1 + > nptl/pthread_setcanceltype.c | 3 ++- > sysdeps/nptl/pthread-functions.h | 1 - > sysdeps/unix/sysv/linux/aarch64/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/alpha/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/arc/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/arm/be/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/arm/le/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/csky/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/hppa/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/i386/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/ia64/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/nios2/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist | 1 - > .../unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 1 - > .../unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/sh/be/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/sh/le/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 1 - > sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist | 1 - > 36 files changed, 4 insertions(+), 36 deletions(-) > > diff --git a/nptl/Makefile b/nptl/Makefile > index fc0c5a405b..098c31115f 100644 > --- a/nptl/Makefile > +++ b/nptl/Makefile > @@ -83,6 +83,7 @@ routines = \ > pthread_once \ > pthread_self \ > pthread_setcancelstate \ > + pthread_setcanceltype \ > pthread_setschedparam \ > pthread_sigmask \ > unwind \ > @@ -204,7 +205,6 @@ libpthread-routines = \ > pthread_rwlockattr_setpshared \ > pthread_setaffinity \ > pthread_setattr_default_np \ > - pthread_setcanceltype \ > pthread_setconcurrency \ > pthread_setname \ > pthread_setschedprio \ Ok. > diff --git a/nptl/Versions b/nptl/Versions > index 32e7acfcae..b619df41fb 100644 > --- a/nptl/Versions > +++ b/nptl/Versions > @@ -193,7 +193,6 @@ libpthread { > pthread_mutexattr_getkind_np; > pthread_mutexattr_init; > pthread_mutexattr_setkind_np; > - pthread_setcanceltype; > pthread_setspecific; > pthread_sigmask; > pthread_testcancel; Ok. > diff --git a/nptl/forward.c b/nptl/forward.c > index ef4a17d39b..de4e9cd6ab 100644 > --- a/nptl/forward.c > +++ b/nptl/forward.c > @@ -101,5 +101,3 @@ FORWARD (pthread_mutex_init, > FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0) > > FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) > - > -FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) Ok. > diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c > index e7615ffcb6..49d811aed7 100644 > --- a/nptl/nptl-init.c > +++ b/nptl/nptl-init.c > @@ -85,7 +85,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_setcanceltype = __pthread_setcanceltype, > .ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock, > .ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock, > .ptr___pthread_rwlock_unlock = __pthread_rwlock_unlock, Ok. > diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h > index 9f07aa718b..4b486b3577 100644 > --- a/nptl/pthreadP.h > +++ b/nptl/pthreadP.h > @@ -531,6 +531,7 @@ extern void __pthread_exit (void *value) __attribute__ ((__noreturn__)); > libc_hidden_proto (__pthread_exit) > extern int __pthread_join (pthread_t threadid, void **thread_return); > extern int __pthread_setcanceltype (int type, int *oldtype); > +libc_hidden_proto (__pthread_setcanceltype) > extern int __pthread_enable_asynccancel (void) attribute_hidden; > extern void __pthread_disable_asynccancel (int oldtype) attribute_hidden; > extern void __pthread_testcancel (void); Ok. > diff --git a/nptl/pthread_setcanceltype.c b/nptl/pthread_setcanceltype.c > index a9ce9b37fb..5f061d512b 100644 > --- a/nptl/pthread_setcanceltype.c > +++ b/nptl/pthread_setcanceltype.c > @@ -68,4 +68,5 @@ __pthread_setcanceltype (int type, int *oldtype) > > return 0; > } > -strong_alias (__pthread_setcanceltype, pthread_setcanceltype) > +libc_hidden_def (__pthread_setcanceltype) > +weak_alias (__pthread_setcanceltype, pthread_setcanceltype) Ok. > diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h > index ca7673135d..2092ecef07 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_setcanceltype) (int, int *); > int (*ptr___pthread_rwlock_rdlock) (pthread_rwlock_t *); > int (*ptr___pthread_rwlock_wrlock) (pthread_rwlock_t *); > int (*ptr___pthread_rwlock_unlock) (pthread_rwlock_t *); Ok. > diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist > index 047869a3a0..47c5564772 100644 > --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist > @@ -133,7 +133,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_setcanceltype F > GLIBC_2.17 pthread_setconcurrency F > GLIBC_2.17 pthread_setname_np F > GLIBC_2.17 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist > index 5252f34efe..1d834d6d54 100644 > --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist > @@ -58,7 +58,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_setcanceltype F > GLIBC_2.0 pthread_setspecific F > GLIBC_2.0 pthread_testcancel F > GLIBC_2.0 raise F > diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist > index 554b85d779..3c1054101c 100644 > --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist > @@ -151,7 +151,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_setcanceltype F > GLIBC_2.32 pthread_setconcurrency F > GLIBC_2.32 pthread_setname_np F > GLIBC_2.32 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist > index bbe8d28583..c2892c4b8d 100644 > --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist > @@ -164,7 +164,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_setcanceltype F > GLIBC_2.4 pthread_setconcurrency F > GLIBC_2.4 pthread_setschedprio F > GLIBC_2.4 pthread_setspecific F > diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist > index bbe8d28583..c2892c4b8d 100644 > --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist > @@ -164,7 +164,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_setcanceltype F > GLIBC_2.4 pthread_setconcurrency F > GLIBC_2.4 pthread_setschedprio F > GLIBC_2.4 pthread_setspecific F > diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist > index c09b6cd6f4..2d125f11a3 100644 > --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist > @@ -146,7 +146,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_setcanceltype F > GLIBC_2.29 pthread_setconcurrency F > GLIBC_2.29 pthread_setname_np F > GLIBC_2.29 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist > index 424e2cf068..11fa4711d8 100644 > --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist > @@ -121,7 +121,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_setcanceltype F > GLIBC_2.2 pthread_setconcurrency F > GLIBC_2.2 pthread_setspecific F > GLIBC_2.2 pthread_spin_destroy F > diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist > index e145d86e57..1d84eb35fb 100644 > --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist > @@ -58,7 +58,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_setcanceltype F > GLIBC_2.0 pthread_setspecific F > GLIBC_2.0 pthread_testcancel F > GLIBC_2.0 raise F > diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist > index 2c131140ba..88e178b1c3 100644 > --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist > @@ -121,7 +121,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_setcanceltype F > GLIBC_2.2 pthread_setconcurrency F > GLIBC_2.2 pthread_setspecific F > GLIBC_2.2 pthread_spin_destroy F > diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist > index bbe8d28583..c2892c4b8d 100644 > --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist > @@ -164,7 +164,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_setcanceltype F > GLIBC_2.4 pthread_setconcurrency F > GLIBC_2.4 pthread_setschedprio F > GLIBC_2.4 pthread_setspecific F > diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist > index e145d86e57..1d84eb35fb 100644 > --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist > @@ -58,7 +58,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_setcanceltype F > GLIBC_2.0 pthread_setspecific F > GLIBC_2.0 pthread_testcancel F > GLIBC_2.0 raise F > diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist > index 31d008004d..b19c648328 100644 > --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist > @@ -135,7 +135,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_setcanceltype F > GLIBC_2.18 pthread_setconcurrency F > GLIBC_2.18 pthread_setname_np F > GLIBC_2.18 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist > index 31d008004d..b19c648328 100644 > --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist > @@ -135,7 +135,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_setcanceltype F > GLIBC_2.18 pthread_setconcurrency F > GLIBC_2.18 pthread_setname_np F > GLIBC_2.18 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist > index d4bd5b5ce3..0d7d23b8f3 100644 > --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist > @@ -58,7 +58,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_setcanceltype F > GLIBC_2.0 pthread_setspecific F > GLIBC_2.0 pthread_testcancel F > GLIBC_2.0 raise F > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist > index d4bd5b5ce3..0d7d23b8f3 100644 > --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist > @@ -58,7 +58,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_setcanceltype F > GLIBC_2.0 pthread_setspecific F > GLIBC_2.0 pthread_testcancel F > GLIBC_2.0 raise F > diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist > index ed8be1e44b..34c81eb8db 100644 > --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist > @@ -135,7 +135,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_setcanceltype F > GLIBC_2.21 pthread_setconcurrency F > GLIBC_2.21 pthread_setname_np F > GLIBC_2.21 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist > index d9e3bb5b31..9ef23ed6d6 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist > @@ -58,7 +58,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_setcanceltype F > GLIBC_2.0 pthread_setspecific F > GLIBC_2.0 pthread_testcancel F > GLIBC_2.0 raise F > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist > index 8f393575e1..5474d3eb4d 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist > @@ -141,7 +141,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_setcanceltype F > GLIBC_2.3 pthread_setconcurrency F > GLIBC_2.3 pthread_setspecific F > GLIBC_2.3 pthread_spin_destroy F > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist > index 047869a3a0..47c5564772 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist > @@ -133,7 +133,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_setcanceltype F > GLIBC_2.17 pthread_setconcurrency F > GLIBC_2.17 pthread_setname_np F > GLIBC_2.17 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist > index 528792a426..e86e8cab1d 100644 > --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist > @@ -151,7 +151,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_setcanceltype F > GLIBC_2.33 pthread_setconcurrency F > GLIBC_2.33 pthread_setname_np F > GLIBC_2.33 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist > index 66f871fb89..220affa7f0 100644 > --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist > @@ -135,7 +135,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_setcanceltype F > GLIBC_2.27 pthread_setconcurrency F > GLIBC_2.27 pthread_setname_np F > GLIBC_2.27 pthread_setschedprio F > diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist > index e69792eba6..81b8d5ce5c 100644 > --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist > @@ -58,7 +58,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_setcanceltype F > GLIBC_2.0 pthread_setspecific F > GLIBC_2.0 pthread_testcancel F > GLIBC_2.0 raise F > diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist > index 75c5a27854..b916709d08 100644 > --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist > @@ -122,7 +122,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_setcanceltype F > GLIBC_2.2 pthread_setconcurrency F > GLIBC_2.2 pthread_setspecific F > GLIBC_2.2 pthread_spin_destroy F > diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist > index 424e2cf068..11fa4711d8 100644 > --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist > @@ -121,7 +121,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_setcanceltype F > GLIBC_2.2 pthread_setconcurrency F > GLIBC_2.2 pthread_setspecific F > GLIBC_2.2 pthread_spin_destroy F > diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist > index 424e2cf068..11fa4711d8 100644 > --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist > @@ -121,7 +121,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_setcanceltype F > GLIBC_2.2 pthread_setconcurrency F > GLIBC_2.2 pthread_setspecific F > GLIBC_2.2 pthread_spin_destroy F > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist > index 5252f34efe..1d834d6d54 100644 > --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist > @@ -58,7 +58,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_setcanceltype F > GLIBC_2.0 pthread_setspecific F > GLIBC_2.0 pthread_testcancel F > GLIBC_2.0 raise F > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist > index 2c131140ba..88e178b1c3 100644 > --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist > @@ -121,7 +121,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_setcanceltype F > GLIBC_2.2 pthread_setconcurrency F > GLIBC_2.2 pthread_setspecific F > GLIBC_2.2 pthread_spin_destroy F > diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist > index afa8bb1dd8..f11ffd687f 100644 > --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist > @@ -121,7 +121,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_setcanceltype F > GLIBC_2.2.5 pthread_setconcurrency F > GLIBC_2.2.5 pthread_setspecific F > GLIBC_2.2.5 pthread_spin_destroy F > diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist > index b8c545b9c0..579d0ffea2 100644 > --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist > @@ -133,7 +133,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_setcanceltype F > GLIBC_2.16 pthread_setconcurrency F > GLIBC_2.16 pthread_setname_np F > GLIBC_2.16 pthread_setschedprio F >