[06/13] nptl: Move pthread_attr_setscope implementation into libc

Message ID 97a9aae0574f576fc231babd19bd7fa5f2094b69.1581418947.git.fweimer@redhat.com
State New
Headers show
Series
  • nptl: Move more functions from libpthread to libc
Related show

Commit Message

Florian Weimer Feb. 11, 2020, 11:06 a.m.
This is part of the libpthread removal project:

  <https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>
---
 nptl/Makefile                                                 | 2 +-
 nptl/Versions                                                 | 2 --
 nptl/forward.c                                                | 4 ----
 nptl/nptl-init.c                                              | 1 -
 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/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/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 -
 32 files changed, 1 insertion(+), 36 deletions(-)

-- 
2.24.1

Comments

Adhemerval Zanella Feb. 19, 2020, 5:41 p.m. | #1
On 11/02/2020 08:06, Florian Weimer wrote:
> This is part of the libpthread removal project:

> 

>   <https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>



LGTM, thanks.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>


> ---

>  nptl/Makefile                                                 | 2 +-

>  nptl/Versions                                                 | 2 --

>  nptl/forward.c                                                | 4 ----

>  nptl/nptl-init.c                                              | 1 -

>  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/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/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 -

>  32 files changed, 1 insertion(+), 36 deletions(-)

> 

> diff --git a/nptl/Makefile b/nptl/Makefile

> index 9a51922e55..04770ea7a5 100644

> --- a/nptl/Makefile

> +++ b/nptl/Makefile

> @@ -48,6 +48,7 @@ routines = \

>    pthread_attr_setinheritsched \

>    pthread_attr_setschedparam \

>    pthread_attr_setschedpolicy \

> +  pthread_attr_setscope \

>    pthread_equal \

>    pthread_self \

>    register-atfork \


Ok.

> @@ -75,7 +76,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \

>  		      pthread_getschedparam pthread_setschedparam \

>  		      pthread_setschedprio \

>  		      pthread_attr_getguardsize pthread_attr_setguardsize \

> -		      pthread_attr_setscope \

>  		      pthread_attr_getstackaddr pthread_attr_setstackaddr \

>  		      pthread_attr_getstacksize pthread_attr_setstacksize \

>  		      pthread_attr_getstack pthread_attr_setstack \


Ok.

> diff --git a/nptl/Versions b/nptl/Versions

> index 88b4266287..5b4852a905 100644

> --- a/nptl/Versions

> +++ b/nptl/Versions

> @@ -49,8 +49,6 @@ libpthread {

>  

>      pthread_getschedparam; pthread_setschedparam;

>  

> -    pthread_attr_setscope;

> -

>      pthread_mutex_init; pthread_mutex_destroy;

>      pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;

>  


Ok.

> diff --git a/nptl/forward.c b/nptl/forward.c

> index 43f9eb699f..2076495a8b 100644

> --- a/nptl/forward.c

> +++ b/nptl/forward.c

> @@ -56,10 +56,6 @@ name decl								      \

>    FORWARD2 (name, int, decl, params, return defretval)

>  

>  

> -FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),

> -	 (attr, scope), 0)

> -

> -

>  FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)

>  FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)

>  


Ok.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c

> index 5ccd69341d..2078c561a8 100644

> --- a/nptl/nptl-init.c

> +++ b/nptl/nptl-init.c

> @@ -72,7 +72,6 @@ void __nptl_set_robust (struct pthread *);

>  #ifdef SHARED

>  static const struct pthread_functions pthread_functions =

>    {

> -    .ptr_pthread_attr_setscope = __pthread_attr_setscope,

>      .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,

>      .ptr_pthread_condattr_init = __pthread_condattr_init,

>      .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,


Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h

> index a38f9d7fc6..38c2c0595a 100644

> --- a/sysdeps/nptl/pthread-functions.h

> +++ b/sysdeps/nptl/pthread-functions.h

> @@ -30,7 +30,6 @@ struct xid_command;

>     the thread functions.  */

>  struct pthread_functions

>  {

> -  int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);

>    int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);

>    int (*ptr_pthread_condattr_init) (pthread_condattr_t *);

>    int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);


Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist

> index 1c1eefb3fd..1bf8ccf282 100644

> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist

> @@ -74,7 +74,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F

>  GLIBC_2.17 pthread_attr_getstacksize F

>  GLIBC_2.17 pthread_attr_setaffinity_np F

>  GLIBC_2.17 pthread_attr_setguardsize F

> -GLIBC_2.17 pthread_attr_setscope F

>  GLIBC_2.17 pthread_attr_setstack F

>  GLIBC_2.17 pthread_attr_setstackaddr F

>  GLIBC_2.17 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist

> index 7c971026f3..ac7b1b2ae8 100644

> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist

> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F

>  GLIBC_2.0 open F

>  GLIBC_2.0 pause F

>  GLIBC_2.0 pthread_atfork F

> -GLIBC_2.0 pthread_attr_setscope F

>  GLIBC_2.0 pthread_cancel F

>  GLIBC_2.0 pthread_cond_broadcast F

>  GLIBC_2.0 pthread_cond_destroy F

> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist

> index 1a3cd91b02..1c4307b259 100644

> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist

> @@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F

>  GLIBC_2.4 pthread_attr_getstacksize F

>  GLIBC_2.4 pthread_attr_setaffinity_np F

>  GLIBC_2.4 pthread_attr_setguardsize F

> -GLIBC_2.4 pthread_attr_setscope F

>  GLIBC_2.4 pthread_attr_setstack F

>  GLIBC_2.4 pthread_attr_setstackaddr F

>  GLIBC_2.4 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist

> index 1a3cd91b02..1c4307b259 100644

> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist

> @@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F

>  GLIBC_2.4 pthread_attr_getstacksize F

>  GLIBC_2.4 pthread_attr_setaffinity_np F

>  GLIBC_2.4 pthread_attr_setguardsize F

> -GLIBC_2.4 pthread_attr_setscope F

>  GLIBC_2.4 pthread_attr_setstack F

>  GLIBC_2.4 pthread_attr_setstackaddr F

>  GLIBC_2.4 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist

> index e201451825..92ac903a4f 100644

> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist

> @@ -82,7 +82,6 @@ GLIBC_2.29 pthread_attr_getstackaddr F

>  GLIBC_2.29 pthread_attr_getstacksize F

>  GLIBC_2.29 pthread_attr_setaffinity_np F

>  GLIBC_2.29 pthread_attr_setguardsize F

> -GLIBC_2.29 pthread_attr_setscope F

>  GLIBC_2.29 pthread_attr_setstack F

>  GLIBC_2.29 pthread_attr_setstackaddr F

>  GLIBC_2.29 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist

> index a0759ebc70..c2dade43aa 100644

> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist

> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F

>  GLIBC_2.2 pthread_attr_getstackaddr F

>  GLIBC_2.2 pthread_attr_getstacksize F

>  GLIBC_2.2 pthread_attr_setguardsize F

> -GLIBC_2.2 pthread_attr_setscope F

>  GLIBC_2.2 pthread_attr_setstack F

>  GLIBC_2.2 pthread_attr_setstackaddr F

>  GLIBC_2.2 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist

> index dab30e943d..a60edd4cbc 100644

> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist

> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F

>  GLIBC_2.0 open F

>  GLIBC_2.0 pause F

>  GLIBC_2.0 pthread_atfork F

> -GLIBC_2.0 pthread_attr_setscope F

>  GLIBC_2.0 pthread_cancel F

>  GLIBC_2.0 pthread_cond_broadcast F

>  GLIBC_2.0 pthread_cond_destroy F

> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist

> index ccf83eb5c2..8a414d895d 100644

> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist

> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F

>  GLIBC_2.2 pthread_attr_getstackaddr F

>  GLIBC_2.2 pthread_attr_getstacksize F

>  GLIBC_2.2 pthread_attr_setguardsize F

> -GLIBC_2.2 pthread_attr_setscope F

>  GLIBC_2.2 pthread_attr_setstack F

>  GLIBC_2.2 pthread_attr_setstackaddr F

>  GLIBC_2.2 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist

> index 1a3cd91b02..1c4307b259 100644

> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist

> @@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F

>  GLIBC_2.4 pthread_attr_getstacksize F

>  GLIBC_2.4 pthread_attr_setaffinity_np F

>  GLIBC_2.4 pthread_attr_setguardsize F

> -GLIBC_2.4 pthread_attr_setscope F

>  GLIBC_2.4 pthread_attr_setstack F

>  GLIBC_2.4 pthread_attr_setstackaddr F

>  GLIBC_2.4 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist

> index dab30e943d..a60edd4cbc 100644

> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist

> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F

>  GLIBC_2.0 open F

>  GLIBC_2.0 pause F

>  GLIBC_2.0 pthread_atfork F

> -GLIBC_2.0 pthread_attr_setscope F

>  GLIBC_2.0 pthread_cancel F

>  GLIBC_2.0 pthread_cond_broadcast F

>  GLIBC_2.0 pthread_cond_destroy F

> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist

> index 185936524a..83352bdc1f 100644

> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist

> @@ -74,7 +74,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F

>  GLIBC_2.18 pthread_attr_getstacksize F

>  GLIBC_2.18 pthread_attr_setaffinity_np F

>  GLIBC_2.18 pthread_attr_setguardsize F

> -GLIBC_2.18 pthread_attr_setscope F

>  GLIBC_2.18 pthread_attr_setstack F

>  GLIBC_2.18 pthread_attr_setstackaddr F

>  GLIBC_2.18 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist

> index 185936524a..83352bdc1f 100644

> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist

> @@ -74,7 +74,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F

>  GLIBC_2.18 pthread_attr_getstacksize F

>  GLIBC_2.18 pthread_attr_setaffinity_np F

>  GLIBC_2.18 pthread_attr_setguardsize F

> -GLIBC_2.18 pthread_attr_setscope F

>  GLIBC_2.18 pthread_attr_setstack F

>  GLIBC_2.18 pthread_attr_setstackaddr F

>  GLIBC_2.18 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist

> index 0a4c17b029..2a19dd6c91 100644

> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist

> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F

>  GLIBC_2.0 open F

>  GLIBC_2.0 pause F

>  GLIBC_2.0 pthread_atfork F

> -GLIBC_2.0 pthread_attr_setscope F

>  GLIBC_2.0 pthread_cancel F

>  GLIBC_2.0 pthread_cond_broadcast F

>  GLIBC_2.0 pthread_cond_destroy F

> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist

> index 0a4c17b029..2a19dd6c91 100644

> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist

> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F

>  GLIBC_2.0 open F

>  GLIBC_2.0 pause F

>  GLIBC_2.0 pthread_atfork F

> -GLIBC_2.0 pthread_attr_setscope F

>  GLIBC_2.0 pthread_cancel F

>  GLIBC_2.0 pthread_cond_broadcast F

>  GLIBC_2.0 pthread_cond_destroy F

> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist

> index edf8c19b72..3c2a84e3ae 100644

> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist

> @@ -74,7 +74,6 @@ GLIBC_2.21 pthread_attr_getstackaddr F

>  GLIBC_2.21 pthread_attr_getstacksize F

>  GLIBC_2.21 pthread_attr_setaffinity_np F

>  GLIBC_2.21 pthread_attr_setguardsize F

> -GLIBC_2.21 pthread_attr_setscope F

>  GLIBC_2.21 pthread_attr_setstack F

>  GLIBC_2.21 pthread_attr_setstackaddr F

>  GLIBC_2.21 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist

> index 2e80e3be32..cb75099001 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist

> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F

>  GLIBC_2.0 open F

>  GLIBC_2.0 pause F

>  GLIBC_2.0 pthread_atfork F

> -GLIBC_2.0 pthread_attr_setscope F

>  GLIBC_2.0 pthread_cancel F

>  GLIBC_2.0 pthread_cond_broadcast F

>  GLIBC_2.0 pthread_cond_destroy F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist

> index 6f12c83064..8cf2fbfc72 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist

> @@ -95,7 +95,6 @@ GLIBC_2.3 pthread_attr_getstack F

>  GLIBC_2.3 pthread_attr_getstackaddr F

>  GLIBC_2.3 pthread_attr_getstacksize F

>  GLIBC_2.3 pthread_attr_setguardsize F

> -GLIBC_2.3 pthread_attr_setscope F

>  GLIBC_2.3 pthread_attr_setstack F

>  GLIBC_2.3 pthread_attr_setstackaddr F

>  GLIBC_2.3 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist

> index 1c1eefb3fd..1bf8ccf282 100644

> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist

> @@ -74,7 +74,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F

>  GLIBC_2.17 pthread_attr_getstacksize F

>  GLIBC_2.17 pthread_attr_setaffinity_np F

>  GLIBC_2.17 pthread_attr_setguardsize F

> -GLIBC_2.17 pthread_attr_setscope F

>  GLIBC_2.17 pthread_attr_setstack F

>  GLIBC_2.17 pthread_attr_setstackaddr F

>  GLIBC_2.17 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist

> index 60a6f89b6f..86184ee17b 100644

> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist

> @@ -71,7 +71,6 @@ GLIBC_2.27 pthread_attr_getstackaddr F

>  GLIBC_2.27 pthread_attr_getstacksize F

>  GLIBC_2.27 pthread_attr_setaffinity_np F

>  GLIBC_2.27 pthread_attr_setguardsize F

> -GLIBC_2.27 pthread_attr_setscope F

>  GLIBC_2.27 pthread_attr_setstack F

>  GLIBC_2.27 pthread_attr_setstackaddr F

>  GLIBC_2.27 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist

> index d37af9c62b..33d54c6c41 100644

> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist

> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F

>  GLIBC_2.0 open F

>  GLIBC_2.0 pause F

>  GLIBC_2.0 pthread_atfork F

> -GLIBC_2.0 pthread_attr_setscope F

>  GLIBC_2.0 pthread_cancel F

>  GLIBC_2.0 pthread_cond_broadcast F

>  GLIBC_2.0 pthread_cond_destroy F

> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist

> index 964eb077d9..8298c36976 100644

> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist

> @@ -77,7 +77,6 @@ GLIBC_2.2 pthread_attr_getstack F

>  GLIBC_2.2 pthread_attr_getstackaddr F

>  GLIBC_2.2 pthread_attr_getstacksize F

>  GLIBC_2.2 pthread_attr_setguardsize F

> -GLIBC_2.2 pthread_attr_setscope F

>  GLIBC_2.2 pthread_attr_setstack F

>  GLIBC_2.2 pthread_attr_setstackaddr F

>  GLIBC_2.2 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist

> index a0759ebc70..c2dade43aa 100644

> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist

> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F

>  GLIBC_2.2 pthread_attr_getstackaddr F

>  GLIBC_2.2 pthread_attr_getstacksize F

>  GLIBC_2.2 pthread_attr_setguardsize F

> -GLIBC_2.2 pthread_attr_setscope F

>  GLIBC_2.2 pthread_attr_setstack F

>  GLIBC_2.2 pthread_attr_setstackaddr F

>  GLIBC_2.2 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist

> index a0759ebc70..c2dade43aa 100644

> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist

> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F

>  GLIBC_2.2 pthread_attr_getstackaddr F

>  GLIBC_2.2 pthread_attr_getstacksize F

>  GLIBC_2.2 pthread_attr_setguardsize F

> -GLIBC_2.2 pthread_attr_setscope F

>  GLIBC_2.2 pthread_attr_setstack F

>  GLIBC_2.2 pthread_attr_setstackaddr F

>  GLIBC_2.2 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist

> index 7c971026f3..ac7b1b2ae8 100644

> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist

> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F

>  GLIBC_2.0 open F

>  GLIBC_2.0 pause F

>  GLIBC_2.0 pthread_atfork F

> -GLIBC_2.0 pthread_attr_setscope F

>  GLIBC_2.0 pthread_cancel F

>  GLIBC_2.0 pthread_cond_broadcast F

>  GLIBC_2.0 pthread_cond_destroy F

> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist

> index ccf83eb5c2..8a414d895d 100644

> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist

> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F

>  GLIBC_2.2 pthread_attr_getstackaddr F

>  GLIBC_2.2 pthread_attr_getstacksize F

>  GLIBC_2.2 pthread_attr_setguardsize F

> -GLIBC_2.2 pthread_attr_setscope F

>  GLIBC_2.2 pthread_attr_setstack F

>  GLIBC_2.2 pthread_attr_setstackaddr F

>  GLIBC_2.2 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist

> index 0a4c6b3361..62b52ec607 100644

> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist

> @@ -75,7 +75,6 @@ GLIBC_2.2.5 pthread_attr_getstack F

>  GLIBC_2.2.5 pthread_attr_getstackaddr F

>  GLIBC_2.2.5 pthread_attr_getstacksize F

>  GLIBC_2.2.5 pthread_attr_setguardsize F

> -GLIBC_2.2.5 pthread_attr_setscope F

>  GLIBC_2.2.5 pthread_attr_setstack F

>  GLIBC_2.2.5 pthread_attr_setstackaddr F

>  GLIBC_2.2.5 pthread_attr_setstacksize F

> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist

> index 35352d5b3f..7597021f4f 100644

> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist

> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist

> @@ -74,7 +74,6 @@ GLIBC_2.16 pthread_attr_getstackaddr F

>  GLIBC_2.16 pthread_attr_getstacksize F

>  GLIBC_2.16 pthread_attr_setaffinity_np F

>  GLIBC_2.16 pthread_attr_setguardsize F

> -GLIBC_2.16 pthread_attr_setscope F

>  GLIBC_2.16 pthread_attr_setstack F

>  GLIBC_2.16 pthread_attr_setstackaddr F

>  GLIBC_2.16 pthread_attr_setstacksize F

> 


Ok.

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index 9a51922e55..04770ea7a5 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -48,6 +48,7 @@  routines = \
   pthread_attr_setinheritsched \
   pthread_attr_setschedparam \
   pthread_attr_setschedpolicy \
+  pthread_attr_setscope \
   pthread_equal \
   pthread_self \
   register-atfork \
@@ -75,7 +76,6 @@  libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_getschedparam pthread_setschedparam \
 		      pthread_setschedprio \
 		      pthread_attr_getguardsize pthread_attr_setguardsize \
-		      pthread_attr_setscope \
 		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
 		      pthread_attr_getstacksize pthread_attr_setstacksize \
 		      pthread_attr_getstack pthread_attr_setstack \
diff --git a/nptl/Versions b/nptl/Versions
index 88b4266287..5b4852a905 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -49,8 +49,6 @@  libpthread {
 
     pthread_getschedparam; pthread_setschedparam;
 
-    pthread_attr_setscope;
-
     pthread_mutex_init; pthread_mutex_destroy;
     pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;
 
diff --git a/nptl/forward.c b/nptl/forward.c
index 43f9eb699f..2076495a8b 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -56,10 +56,6 @@  name decl								      \
   FORWARD2 (name, int, decl, params, return defretval)
 
 
-FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
-	 (attr, scope), 0)
-
-
 FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
 FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
 
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 5ccd69341d..2078c561a8 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -72,7 +72,6 @@  void __nptl_set_robust (struct pthread *);
 #ifdef SHARED
 static const struct pthread_functions pthread_functions =
   {
-    .ptr_pthread_attr_setscope = __pthread_attr_setscope,
     .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
     .ptr_pthread_condattr_init = __pthread_condattr_init,
     .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index a38f9d7fc6..38c2c0595a 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -30,7 +30,6 @@  struct xid_command;
    the thread functions.  */
 struct pthread_functions
 {
-  int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);
   int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
   int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
   int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 1c1eefb3fd..1bf8ccf282 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -74,7 +74,6 @@  GLIBC_2.17 pthread_attr_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
 GLIBC_2.17 pthread_attr_setaffinity_np F
 GLIBC_2.17 pthread_attr_setguardsize F
-GLIBC_2.17 pthread_attr_setscope F
 GLIBC_2.17 pthread_attr_setstack F
 GLIBC_2.17 pthread_attr_setstackaddr F
 GLIBC_2.17 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 7c971026f3..ac7b1b2ae8 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -44,7 +44,6 @@  GLIBC_2.0 msync F
 GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 1a3cd91b02..1c4307b259 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -109,7 +109,6 @@  GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 1a3cd91b02..1c4307b259 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -109,7 +109,6 @@  GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index e201451825..92ac903a4f 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -82,7 +82,6 @@  GLIBC_2.29 pthread_attr_getstackaddr F
 GLIBC_2.29 pthread_attr_getstacksize F
 GLIBC_2.29 pthread_attr_setaffinity_np F
 GLIBC_2.29 pthread_attr_setguardsize F
-GLIBC_2.29 pthread_attr_setscope F
 GLIBC_2.29 pthread_attr_setstack F
 GLIBC_2.29 pthread_attr_setstackaddr F
 GLIBC_2.29 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index a0759ebc70..c2dade43aa 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -75,7 +75,6 @@  GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index dab30e943d..a60edd4cbc 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -44,7 +44,6 @@  GLIBC_2.0 msync F
 GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index ccf83eb5c2..8a414d895d 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -75,7 +75,6 @@  GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 1a3cd91b02..1c4307b259 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -109,7 +109,6 @@  GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index dab30e943d..a60edd4cbc 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -44,7 +44,6 @@  GLIBC_2.0 msync F
 GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index 185936524a..83352bdc1f 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -74,7 +74,6 @@  GLIBC_2.18 pthread_attr_getstackaddr F
 GLIBC_2.18 pthread_attr_getstacksize F
 GLIBC_2.18 pthread_attr_setaffinity_np F
 GLIBC_2.18 pthread_attr_setguardsize F
-GLIBC_2.18 pthread_attr_setscope F
 GLIBC_2.18 pthread_attr_setstack F
 GLIBC_2.18 pthread_attr_setstackaddr F
 GLIBC_2.18 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index 185936524a..83352bdc1f 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -74,7 +74,6 @@  GLIBC_2.18 pthread_attr_getstackaddr F
 GLIBC_2.18 pthread_attr_getstacksize F
 GLIBC_2.18 pthread_attr_setaffinity_np F
 GLIBC_2.18 pthread_attr_setguardsize F
-GLIBC_2.18 pthread_attr_setscope F
 GLIBC_2.18 pthread_attr_setstack F
 GLIBC_2.18 pthread_attr_setstackaddr F
 GLIBC_2.18 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 0a4c17b029..2a19dd6c91 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -44,7 +44,6 @@  GLIBC_2.0 msync F
 GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 0a4c17b029..2a19dd6c91 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -44,7 +44,6 @@  GLIBC_2.0 msync F
 GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index edf8c19b72..3c2a84e3ae 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -74,7 +74,6 @@  GLIBC_2.21 pthread_attr_getstackaddr F
 GLIBC_2.21 pthread_attr_getstacksize F
 GLIBC_2.21 pthread_attr_setaffinity_np F
 GLIBC_2.21 pthread_attr_setguardsize F
-GLIBC_2.21 pthread_attr_setscope F
 GLIBC_2.21 pthread_attr_setstack F
 GLIBC_2.21 pthread_attr_setstackaddr F
 GLIBC_2.21 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 2e80e3be32..cb75099001 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -44,7 +44,6 @@  GLIBC_2.0 msync F
 GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 6f12c83064..8cf2fbfc72 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -95,7 +95,6 @@  GLIBC_2.3 pthread_attr_getstack F
 GLIBC_2.3 pthread_attr_getstackaddr F
 GLIBC_2.3 pthread_attr_getstacksize F
 GLIBC_2.3 pthread_attr_setguardsize F
-GLIBC_2.3 pthread_attr_setscope F
 GLIBC_2.3 pthread_attr_setstack F
 GLIBC_2.3 pthread_attr_setstackaddr F
 GLIBC_2.3 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index 1c1eefb3fd..1bf8ccf282 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -74,7 +74,6 @@  GLIBC_2.17 pthread_attr_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
 GLIBC_2.17 pthread_attr_setaffinity_np F
 GLIBC_2.17 pthread_attr_setguardsize F
-GLIBC_2.17 pthread_attr_setscope F
 GLIBC_2.17 pthread_attr_setstack F
 GLIBC_2.17 pthread_attr_setstackaddr F
 GLIBC_2.17 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 60a6f89b6f..86184ee17b 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -71,7 +71,6 @@  GLIBC_2.27 pthread_attr_getstackaddr F
 GLIBC_2.27 pthread_attr_getstacksize F
 GLIBC_2.27 pthread_attr_setaffinity_np F
 GLIBC_2.27 pthread_attr_setguardsize F
-GLIBC_2.27 pthread_attr_setscope F
 GLIBC_2.27 pthread_attr_setstack F
 GLIBC_2.27 pthread_attr_setstackaddr F
 GLIBC_2.27 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index d37af9c62b..33d54c6c41 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -44,7 +44,6 @@  GLIBC_2.0 msync F
 GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 964eb077d9..8298c36976 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -77,7 +77,6 @@  GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index a0759ebc70..c2dade43aa 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -75,7 +75,6 @@  GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index a0759ebc70..c2dade43aa 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -75,7 +75,6 @@  GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 7c971026f3..ac7b1b2ae8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -44,7 +44,6 @@  GLIBC_2.0 msync F
 GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index ccf83eb5c2..8a414d895d 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -75,7 +75,6 @@  GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 0a4c6b3361..62b52ec607 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -75,7 +75,6 @@  GLIBC_2.2.5 pthread_attr_getstack F
 GLIBC_2.2.5 pthread_attr_getstackaddr F
 GLIBC_2.2.5 pthread_attr_getstacksize F
 GLIBC_2.2.5 pthread_attr_setguardsize F
-GLIBC_2.2.5 pthread_attr_setscope F
 GLIBC_2.2.5 pthread_attr_setstack F
 GLIBC_2.2.5 pthread_attr_setstackaddr F
 GLIBC_2.2.5 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 35352d5b3f..7597021f4f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -74,7 +74,6 @@  GLIBC_2.16 pthread_attr_getstackaddr F
 GLIBC_2.16 pthread_attr_getstacksize F
 GLIBC_2.16 pthread_attr_setaffinity_np F
 GLIBC_2.16 pthread_attr_setguardsize F
-GLIBC_2.16 pthread_attr_setscope F
 GLIBC_2.16 pthread_attr_setstack F
 GLIBC_2.16 pthread_attr_setstackaddr F
 GLIBC_2.16 pthread_attr_setstacksize F