diff mbox series

[19/23] nptl: Move pthread_setaffinity_np into libc

Message ID f2cca3258340dca907901a10d4fa015a0e7f65ed.1620838411.git.fweimer@redhat.com
State New
Headers show
Series nptl: Move almost all remaining functions into libc | expand

Commit Message

Florian Weimer May 12, 2021, 4:59 p.m. UTC 
The symbol was moved using scripts/move-symbol-to-libc.py.
---
 nptl/Makefile                                          |  2 +-
 nptl/Versions                                          |  5 +++--
 nptl/libpthread-compat.c                               |  5 +++++
 nptl/pthread_setaffinity.c                             | 10 +++++++---
 sysdeps/unix/sysv/linux/aarch64/libc.abilist           |  2 ++
 sysdeps/unix/sysv/linux/aarch64/libpthread.abilist     |  1 -
 sysdeps/unix/sysv/linux/alpha/libc.abilist             |  3 +++
 sysdeps/unix/sysv/linux/alpha/libpthread.abilist       |  3 +--
 sysdeps/unix/sysv/linux/arc/libc.abilist               |  2 ++
 sysdeps/unix/sysv/linux/arc/libpthread.abilist         |  1 -
 sysdeps/unix/sysv/linux/arm/be/libc.abilist            |  2 ++
 sysdeps/unix/sysv/linux/arm/be/libpthread.abilist      |  1 -
 sysdeps/unix/sysv/linux/arm/le/libc.abilist            |  2 ++
 sysdeps/unix/sysv/linux/arm/le/libpthread.abilist      |  1 -
 sysdeps/unix/sysv/linux/csky/libc.abilist              |  2 ++
 sysdeps/unix/sysv/linux/csky/libpthread.abilist        |  1 -
 sysdeps/unix/sysv/linux/hppa/libc.abilist              |  3 +++
 sysdeps/unix/sysv/linux/hppa/libpthread.abilist        |  3 +--
 sysdeps/unix/sysv/linux/i386/libc.abilist              |  3 +++
 sysdeps/unix/sysv/linux/i386/libpthread.abilist        |  3 +--
 sysdeps/unix/sysv/linux/ia64/libc.abilist              |  3 +++
 sysdeps/unix/sysv/linux/ia64/libpthread.abilist        |  3 +--
 sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist     |  2 ++
 .../unix/sysv/linux/m68k/coldfire/libpthread.abilist   |  1 -
 sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist       |  3 +++
 sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist |  3 +--
 sysdeps/unix/sysv/linux/microblaze/be/libc.abilist     |  2 ++
 .../unix/sysv/linux/microblaze/be/libpthread.abilist   |  1 -
 sysdeps/unix/sysv/linux/microblaze/le/libc.abilist     |  2 ++
 .../unix/sysv/linux/microblaze/le/libpthread.abilist   |  1 -
 sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist   |  3 +++
 sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist |  3 +--
 sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist |  3 +++
 sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist |  3 +--
 sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist   |  3 +++
 sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist   |  3 +++
 sysdeps/unix/sysv/linux/nios2/libc.abilist             |  2 ++
 sysdeps/unix/sysv/linux/nios2/libpthread.abilist       |  1 -
 .../unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist |  3 +++
 .../sysv/linux/powerpc/powerpc32/libpthread.abilist    |  3 +--
 .../sysv/linux/powerpc/powerpc32/nofpu/libc.abilist    |  3 +++
 .../unix/sysv/linux/powerpc/powerpc64/be/libc.abilist  |  3 +++
 .../sysv/linux/powerpc/powerpc64/be/libpthread.abilist |  3 +--
 .../unix/sysv/linux/powerpc/powerpc64/le/libc.abilist  |  2 ++
 .../sysv/linux/powerpc/powerpc64/le/libpthread.abilist |  1 -
 sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist        |  2 ++
 sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist  |  1 -
 sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist        |  2 ++
 sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist  |  1 -
 sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist      |  3 +++
 .../unix/sysv/linux/s390/s390-32/libpthread.abilist    |  3 +--
 sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist      |  3 +++
 .../unix/sysv/linux/s390/s390-64/libpthread.abilist    |  3 +--
 sysdeps/unix/sysv/linux/sh/be/libc.abilist             |  3 +++
 sysdeps/unix/sysv/linux/sh/be/libpthread.abilist       |  3 +--
 sysdeps/unix/sysv/linux/sh/le/libc.abilist             |  3 +++
 sysdeps/unix/sysv/linux/sh/le/libpthread.abilist       |  3 +--
 sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist     |  3 +++
 .../unix/sysv/linux/sparc/sparc32/libpthread.abilist   |  3 +--
 sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist     |  3 +++
 .../unix/sysv/linux/sparc/sparc64/libpthread.abilist   |  3 +--
 sysdeps/unix/sysv/linux/x86_64/64/libc.abilist         |  3 +++
 sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist   |  3 +--
 sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist        |  2 ++
 sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist  |  1 -
 65 files changed, 115 insertions(+), 51 deletions(-)

Comments

Adhemerval Zanella Netto May 14, 2021, 2:45 p.m. UTC | #1 
On 12/05/2021 13:59, Florian Weimer via Libc-alpha wrote:
> The symbol was moved using scripts/move-symbol-to-libc.py.

LGTM, thanks.

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

> ---
>  nptl/Makefile                                          |  2 +-
>  nptl/Versions                                          |  5 +++--
>  nptl/libpthread-compat.c                               |  5 +++++
>  nptl/pthread_setaffinity.c                             | 10 +++++++---
>  sysdeps/unix/sysv/linux/aarch64/libc.abilist           |  2 ++
>  sysdeps/unix/sysv/linux/aarch64/libpthread.abilist     |  1 -
>  sysdeps/unix/sysv/linux/alpha/libc.abilist             |  3 +++
>  sysdeps/unix/sysv/linux/alpha/libpthread.abilist       |  3 +--
>  sysdeps/unix/sysv/linux/arc/libc.abilist               |  2 ++
>  sysdeps/unix/sysv/linux/arc/libpthread.abilist         |  1 -
>  sysdeps/unix/sysv/linux/arm/be/libc.abilist            |  2 ++
>  sysdeps/unix/sysv/linux/arm/be/libpthread.abilist      |  1 -
>  sysdeps/unix/sysv/linux/arm/le/libc.abilist            |  2 ++
>  sysdeps/unix/sysv/linux/arm/le/libpthread.abilist      |  1 -
>  sysdeps/unix/sysv/linux/csky/libc.abilist              |  2 ++
>  sysdeps/unix/sysv/linux/csky/libpthread.abilist        |  1 -
>  sysdeps/unix/sysv/linux/hppa/libc.abilist              |  3 +++
>  sysdeps/unix/sysv/linux/hppa/libpthread.abilist        |  3 +--
>  sysdeps/unix/sysv/linux/i386/libc.abilist              |  3 +++
>  sysdeps/unix/sysv/linux/i386/libpthread.abilist        |  3 +--
>  sysdeps/unix/sysv/linux/ia64/libc.abilist              |  3 +++
>  sysdeps/unix/sysv/linux/ia64/libpthread.abilist        |  3 +--
>  sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist     |  2 ++
>  .../unix/sysv/linux/m68k/coldfire/libpthread.abilist   |  1 -
>  sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist       |  3 +++
>  sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist |  3 +--
>  sysdeps/unix/sysv/linux/microblaze/be/libc.abilist     |  2 ++
>  .../unix/sysv/linux/microblaze/be/libpthread.abilist   |  1 -
>  sysdeps/unix/sysv/linux/microblaze/le/libc.abilist     |  2 ++
>  .../unix/sysv/linux/microblaze/le/libpthread.abilist   |  1 -
>  sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist   |  3 +++
>  sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist |  3 +--
>  sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist |  3 +++
>  sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist |  3 +--
>  sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist   |  3 +++
>  sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist   |  3 +++
>  sysdeps/unix/sysv/linux/nios2/libc.abilist             |  2 ++
>  sysdeps/unix/sysv/linux/nios2/libpthread.abilist       |  1 -
>  .../unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist |  3 +++
>  .../sysv/linux/powerpc/powerpc32/libpthread.abilist    |  3 +--
>  .../sysv/linux/powerpc/powerpc32/nofpu/libc.abilist    |  3 +++
>  .../unix/sysv/linux/powerpc/powerpc64/be/libc.abilist  |  3 +++
>  .../sysv/linux/powerpc/powerpc64/be/libpthread.abilist |  3 +--
>  .../unix/sysv/linux/powerpc/powerpc64/le/libc.abilist  |  2 ++
>  .../sysv/linux/powerpc/powerpc64/le/libpthread.abilist |  1 -
>  sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist        |  2 ++
>  sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist  |  1 -
>  sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist        |  2 ++
>  sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist  |  1 -
>  sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist      |  3 +++
>  .../unix/sysv/linux/s390/s390-32/libpthread.abilist    |  3 +--
>  sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist      |  3 +++
>  .../unix/sysv/linux/s390/s390-64/libpthread.abilist    |  3 +--
>  sysdeps/unix/sysv/linux/sh/be/libc.abilist             |  3 +++
>  sysdeps/unix/sysv/linux/sh/be/libpthread.abilist       |  3 +--
>  sysdeps/unix/sysv/linux/sh/le/libc.abilist             |  3 +++
>  sysdeps/unix/sysv/linux/sh/le/libpthread.abilist       |  3 +--
>  sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist     |  3 +++
>  .../unix/sysv/linux/sparc/sparc32/libpthread.abilist   |  3 +--
>  sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist     |  3 +++
>  .../unix/sysv/linux/sparc/sparc64/libpthread.abilist   |  3 +--
>  sysdeps/unix/sysv/linux/x86_64/64/libc.abilist         |  3 +++
>  sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist   |  3 +--
>  sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist        |  2 ++
>  sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist  |  1 -
>  65 files changed, 115 insertions(+), 51 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 516410cb84..a33f495653 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -169,6 +169,7 @@ routines = \
>    pthread_rwlockattr_setkind_np \
>    pthread_rwlockattr_setpshared \
>    pthread_self \
> +  pthread_setaffinity \
>    pthread_setattr_default_np \
>    pthread_setcancelstate \
>    pthread_setcanceltype \
> @@ -208,7 +209,6 @@ libpthread-routines = \
>    nptl-init \
>    pt-interp \
>    pthread_create \
> -  pthread_setaffinity \
>    pthread_setname \
>    pthread_setschedprio \
>    pthread_sigqueue \

Ok.

> diff --git a/nptl/Versions b/nptl/Versions
> index cfdf548c77..9293151253 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -166,12 +166,14 @@ libc {
>      pthread_condattr_getclock;
>      pthread_condattr_setclock;
>      pthread_getaffinity_np;
> +    pthread_setaffinity_np;
>      pthread_timedjoin_np;
>      pthread_tryjoin_np;
>    }
>    GLIBC_2.3.4 {
>      pthread_attr_getaffinity_np;
>      pthread_attr_setaffinity_np;
> +    pthread_setaffinity_np;
>    }
>    GLIBC_2.4 {
>      pthread_mutex_consistent_np;
> @@ -455,12 +457,11 @@ libpthread {
>    }
>  
>    GLIBC_2.3.3 {
> -    pthread_setaffinity_np;
> +    __libpthread_version_placeholder;
>    }
>  
>    GLIBC_2.3.4 {
>      pthread_getaffinity_np;
> -    pthread_setaffinity_np;
>      pthread_setschedprio;
>    }
>  

Ok.

> diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c
> index 18069870d1..a0c0102fd8 100644
> --- a/nptl/libpthread-compat.c
> +++ b/nptl/libpthread-compat.c
> @@ -70,6 +70,11 @@ compat_symbol (libpthread, __libpthread_version_placeholder_1,
>  	       __libpthread_version_placeholder, GLIBC_2_3_2);
>  #endif
>  
> +#if (SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4))
> +compat_symbol (libpthread, __libpthread_version_placeholder_1,
> +	       __libpthread_version_placeholder, GLIBC_2_3_3);
> +#endif
> +
>  #if (SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_5))
>  compat_symbol (libpthread, __libpthread_version_placeholder_1,
>  	       __libpthread_version_placeholder, GLIBC_2_4);

Ok.

> diff --git a/nptl/pthread_setaffinity.c b/nptl/pthread_setaffinity.c
> index e0226ea890..3bfdc63e19 100644
> --- a/nptl/pthread_setaffinity.c
> +++ b/nptl/pthread_setaffinity.c
> @@ -37,11 +37,15 @@ __pthread_setaffinity_new (pthread_t th, size_t cpusetsize,
>  	  ? INTERNAL_SYSCALL_ERRNO (res)
>  	  : 0);
>  }
> -versioned_symbol (libpthread, __pthread_setaffinity_new,
> -		  pthread_setaffinity_np, GLIBC_2_3_4);
> +versioned_symbol (libc, __pthread_setaffinity_new,
> +		  pthread_setaffinity_np, GLIBC_2_34);
>  
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_4, GLIBC_2_34)
> +compat_symbol (libpthread, __pthread_setaffinity_new,
> +	       pthread_setaffinity_np, GLIBC_2_3_4);
> +#endif
>  
> -#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
>  int
>  __pthread_setaffinity_old (pthread_t th, cpu_set_t *cpuset)
>  {

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index a0043fcc72..5a0899fe90 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -1546,6 +1546,7 @@ 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_self 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
> @@ -2412,6 +2413,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 8245b4910a..0272714fce 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.17 __errno_location F
>  GLIBC_2.17 pthread_create F
> -GLIBC_2.17 pthread_setaffinity_np F
>  GLIBC_2.17 pthread_setname_np F
>  GLIBC_2.17 pthread_setschedprio F
>  GLIBC_2.17 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index 1409f32c5e..25d8603bc0 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -2307,6 +2307,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2358,6 +2359,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2502,6 +2504,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 3a8fce8fc2..7b143cd3d7 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -11,8 +11,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index a780f261bd..088f9056c6 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -1491,6 +1491,7 @@ GLIBC_2.32 pthread_rwlockattr_init F
>  GLIBC_2.32 pthread_rwlockattr_setkind_np F
>  GLIBC_2.32 pthread_rwlockattr_setpshared F
>  GLIBC_2.32 pthread_self 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
> @@ -2171,6 +2172,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> index dff4c4d2ae..5e1f4425f2 100644
> --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.32 __errno_location F
>  GLIBC_2.32 pthread_create F
> -GLIBC_2.32 pthread_setaffinity_np F
>  GLIBC_2.32 pthread_setname_np F
>  GLIBC_2.32 pthread_setschedprio F
>  GLIBC_2.32 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 3c4439d0fd..afee2d9bb9 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -280,6 +280,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> @@ -1787,6 +1788,7 @@ 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_self 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
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 9459d1f7fb..e4421d1661 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -7,5 +7,4 @@ GLIBC_2.31 __libpthread_version_placeholder F
>  GLIBC_2.4 __errno_location F
>  GLIBC_2.4 __libpthread_version_placeholder F
>  GLIBC_2.4 pthread_create F
> -GLIBC_2.4 pthread_setaffinity_np F
>  GLIBC_2.4 pthread_setschedprio F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index 05174f6fb0..e360433660 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -277,6 +277,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> @@ -1784,6 +1785,7 @@ 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_self 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
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 9459d1f7fb..e4421d1661 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -7,5 +7,4 @@ GLIBC_2.31 __libpthread_version_placeholder F
>  GLIBC_2.4 __errno_location F
>  GLIBC_2.4 __libpthread_version_placeholder F
>  GLIBC_2.4 pthread_create F
> -GLIBC_2.4 pthread_setaffinity_np F
>  GLIBC_2.4 pthread_setschedprio F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index 515dc54d6a..5f0d74c38b 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -1547,6 +1547,7 @@ GLIBC_2.29 pthread_rwlockattr_init F
>  GLIBC_2.29 pthread_rwlockattr_setkind_np F
>  GLIBC_2.29 pthread_rwlockattr_setpshared F
>  GLIBC_2.29 pthread_self 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
> @@ -2355,6 +2356,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index ba9e21e735..976476e6b0 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.29 __errno_location F
>  GLIBC_2.29 pthread_create F
> -GLIBC_2.29 pthread_setaffinity_np F
>  GLIBC_2.29 pthread_setname_np F
>  GLIBC_2.29 pthread_setschedprio F
>  GLIBC_2.29 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index 78e104a073..f050474ba0 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -2142,6 +2142,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2175,6 +2176,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2307,6 +2309,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index 6b97d836ef..f301ecb383 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -7,8 +7,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index e713095510..515d3af6f5 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -2322,6 +2322,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2355,6 +2356,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2490,6 +2492,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index 3a8fce8fc2..7b143cd3d7 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -11,8 +11,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index f1eb533894..1cd3220ff4 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -2175,6 +2175,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2210,6 +2211,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2343,6 +2345,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index 6b97d836ef..f301ecb383 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -7,8 +7,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index 97efbfdd91..3f9003bf89 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -281,6 +281,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> @@ -1767,6 +1768,7 @@ 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_self 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
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 9459d1f7fb..e4421d1661 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -7,5 +7,4 @@ GLIBC_2.31 __libpthread_version_placeholder F
>  GLIBC_2.4 __errno_location F
>  GLIBC_2.4 __libpthread_version_placeholder F
>  GLIBC_2.4 pthread_create F
> -GLIBC_2.4 pthread_setaffinity_np F
>  GLIBC_2.4 pthread_setschedprio F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index a242798112..013e5de06d 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -2265,6 +2265,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2298,6 +2299,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2433,6 +2435,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index 3a8fce8fc2..7b143cd3d7 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -11,8 +11,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index ed8e1cd0d5..1df55eb788 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -1549,6 +1549,7 @@ GLIBC_2.18 pthread_rwlockattr_init F
>  GLIBC_2.18 pthread_rwlockattr_setkind_np F
>  GLIBC_2.18 pthread_rwlockattr_setpshared F
>  GLIBC_2.18 pthread_self 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
> @@ -2406,6 +2407,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index e4c2d2c0fe..44cc2080c2 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.18 __errno_location F
>  GLIBC_2.18 pthread_create F
> -GLIBC_2.18 pthread_setaffinity_np F
>  GLIBC_2.18 pthread_setname_np F
>  GLIBC_2.18 pthread_setschedprio F
>  GLIBC_2.18 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index 71c563bc1d..b397b1cbee 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -1549,6 +1549,7 @@ GLIBC_2.18 pthread_rwlockattr_init F
>  GLIBC_2.18 pthread_rwlockattr_setkind_np F
>  GLIBC_2.18 pthread_rwlockattr_setpshared F
>  GLIBC_2.18 pthread_self 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
> @@ -2403,6 +2404,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index e4c2d2c0fe..44cc2080c2 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.18 __errno_location F
>  GLIBC_2.18 pthread_create F
> -GLIBC_2.18 pthread_setaffinity_np F
>  GLIBC_2.18 pthread_setname_np F
>  GLIBC_2.18 pthread_setschedprio F
>  GLIBC_2.18 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index de345aa521..0b366d487f 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -2233,6 +2233,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2266,6 +2267,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2398,6 +2400,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 8827ba7772..c884dfc6ae 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -8,8 +8,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index 5ace56265c..8361b430df 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -2231,6 +2231,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2264,6 +2265,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2396,6 +2398,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 8827ba7772..c884dfc6ae 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -8,8 +8,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index 31acf12768..642ce9dceb 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -2239,6 +2239,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2272,6 +2273,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2404,6 +2406,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index 4d5e4e9dd4..48632de397 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -2231,6 +2231,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2266,6 +2267,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2398,6 +2400,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index 2176d0e6e4..125fe4d799 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -1592,6 +1592,7 @@ GLIBC_2.21 pthread_rwlockattr_init F
>  GLIBC_2.21 pthread_rwlockattr_setkind_np F
>  GLIBC_2.21 pthread_rwlockattr_setpshared F
>  GLIBC_2.21 pthread_self 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
> @@ -2445,6 +2446,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 9009a98b88..3f25a85a5f 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.21 __errno_location F
>  GLIBC_2.21 pthread_create F
> -GLIBC_2.21 pthread_setaffinity_np F
>  GLIBC_2.21 pthread_setname_np F
>  GLIBC_2.21 pthread_setschedprio F
>  GLIBC_2.21 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index 3abd4e065f..893c46b74a 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -2271,6 +2271,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2312,6 +2313,7 @@ GLIBC_2.3.4 makecontext F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2460,6 +2462,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index a5c6a8d42f..7d6a83c3af 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -11,8 +11,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index 67db071d92..5b828687bf 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -2304,6 +2304,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2345,6 +2346,7 @@ GLIBC_2.3.4 makecontext F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2493,6 +2495,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> index a2b923bcb2..3e7677e070 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -2120,6 +2120,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2160,6 +2161,7 @@ GLIBC_2.3.4 longjmp F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2308,6 +2310,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index 8b55edb1b4..1d08bd8e73 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -5,8 +5,7 @@ GLIBC_2.28 thrd_create F
>  GLIBC_2.3 __errno_location F
>  GLIBC_2.3 pthread_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index 2827acac75..4b29564e00 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -1634,6 +1634,7 @@ 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_self 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
> @@ -2608,6 +2609,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 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 8245b4910a..0272714fce 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.17 __errno_location F
>  GLIBC_2.17 pthread_create F
> -GLIBC_2.17 pthread_setaffinity_np F
>  GLIBC_2.17 pthread_setname_np F
>  GLIBC_2.17 pthread_setschedprio F
>  GLIBC_2.17 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index d26c0b603e..ba876fc418 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -1493,6 +1493,7 @@ GLIBC_2.33 pthread_rwlockattr_init F
>  GLIBC_2.33 pthread_rwlockattr_setkind_np F
>  GLIBC_2.33 pthread_rwlockattr_setpshared F
>  GLIBC_2.33 pthread_self 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
> @@ -2173,6 +2174,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> index b1f30a796c..86594445c3 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.33 __errno_location F
>  GLIBC_2.33 pthread_create F
> -GLIBC_2.33 pthread_setaffinity_np F
>  GLIBC_2.33 pthread_setname_np F
>  GLIBC_2.33 pthread_setschedprio F
>  GLIBC_2.33 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index 7e77123dec..6f45a3ebd6 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -1537,6 +1537,7 @@ GLIBC_2.27 pthread_rwlockattr_init F
>  GLIBC_2.27 pthread_rwlockattr_setkind_np F
>  GLIBC_2.27 pthread_rwlockattr_setpshared F
>  GLIBC_2.27 pthread_self 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
> @@ -2373,6 +2374,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index e1c2320d40..2f58bb845c 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.27 __errno_location F
>  GLIBC_2.27 pthread_create F
> -GLIBC_2.27 pthread_setaffinity_np F
>  GLIBC_2.27 pthread_setname_np F
>  GLIBC_2.27 pthread_setschedprio F
>  GLIBC_2.27 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index f077792865..ea42d4f420 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -2278,6 +2278,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2311,6 +2312,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2458,6 +2460,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index a084421929..12048bef37 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -12,8 +12,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index 1e103ce570..811121dbb9 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -2166,6 +2166,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2201,6 +2202,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2345,6 +2347,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 68f74e182f..c685c20bf7 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -8,8 +8,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index 5644da2e1d..85d2b2c13f 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -2146,6 +2146,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2179,6 +2180,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2314,6 +2316,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index 6b97d836ef..f301ecb383 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -7,8 +7,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 7b9badf6b1..d3429b6d96 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -2146,6 +2146,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2179,6 +2180,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2311,6 +2313,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index 6b97d836ef..f301ecb383 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -7,8 +7,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index 0ab8427a30..be5a5aabd5 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -2274,6 +2274,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2307,6 +2308,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2451,6 +2453,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 3a8fce8fc2..7b143cd3d7 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -11,8 +11,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index c1aa8d592e..8e88035ee6 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -2197,6 +2197,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2232,6 +2233,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2364,6 +2366,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index 6b97d836ef..f301ecb383 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -7,8 +7,7 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index 68d829d128..18eaaad847 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -2154,6 +2154,7 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F
>  GLIBC_2.3.3 pthread_condattr_getclock F
>  GLIBC_2.3.3 pthread_condattr_setclock F
>  GLIBC_2.3.3 pthread_getaffinity_np F
> +GLIBC_2.3.3 pthread_setaffinity_np F
>  GLIBC_2.3.3 pthread_timedjoin_np F
>  GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.3 remap_file_pages F
> @@ -2189,6 +2190,7 @@ GLIBC_2.3.4 getsourcefilter F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_attr_setaffinity_np F
>  GLIBC_2.3.4 pthread_getaffinity_np F
> +GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 regexec F
>  GLIBC_2.3.4 sched_getaffinity F
>  GLIBC_2.3.4 sched_setaffinity F
> @@ -2323,6 +2325,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 pthread_setspecific F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index a0954fccc5..0759d42083 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -6,8 +6,7 @@ GLIBC_2.2.5 pthread_create F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 pthread_setaffinity_np F
> -GLIBC_2.3.4 pthread_setaffinity_np F
> +GLIBC_2.3.3 __libpthread_version_placeholder F
>  GLIBC_2.3.4 pthread_setschedprio F
>  GLIBC_2.30 __libpthread_version_placeholder F
>  GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index f4364769c7..6b754260c7 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -1553,6 +1553,7 @@ 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_self 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
> @@ -2427,6 +2428,7 @@ GLIBC_2.34 pthread_rwlockattr_getpshared F
>  GLIBC_2.34 pthread_rwlockattr_init F
>  GLIBC_2.34 pthread_rwlockattr_setkind_np F
>  GLIBC_2.34 pthread_rwlockattr_setpshared F
> +GLIBC_2.34 pthread_setaffinity_np F
>  GLIBC_2.34 pthread_setattr_default_np F
>  GLIBC_2.34 pthread_setconcurrency F
>  GLIBC_2.34 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 c8f7f67b98..1e6013cfe6 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -1,6 +1,5 @@
>  GLIBC_2.16 __errno_location F
>  GLIBC_2.16 pthread_create F
> -GLIBC_2.16 pthread_setaffinity_np F
>  GLIBC_2.16 pthread_setname_np F
>  GLIBC_2.16 pthread_setschedprio F
>  GLIBC_2.16 pthread_sigqueue F
>
diff mbox series

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index 516410cb84..a33f495653 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -169,6 +169,7 @@  routines = \
   pthread_rwlockattr_setkind_np \
   pthread_rwlockattr_setpshared \
   pthread_self \
+  pthread_setaffinity \
   pthread_setattr_default_np \
   pthread_setcancelstate \
   pthread_setcanceltype \
@@ -208,7 +209,6 @@  libpthread-routines = \
   nptl-init \
   pt-interp \
   pthread_create \
-  pthread_setaffinity \
   pthread_setname \
   pthread_setschedprio \
   pthread_sigqueue \
diff --git a/nptl/Versions b/nptl/Versions
index cfdf548c77..9293151253 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -166,12 +166,14 @@  libc {
     pthread_condattr_getclock;
     pthread_condattr_setclock;
     pthread_getaffinity_np;
+    pthread_setaffinity_np;
     pthread_timedjoin_np;
     pthread_tryjoin_np;
   }
   GLIBC_2.3.4 {
     pthread_attr_getaffinity_np;
     pthread_attr_setaffinity_np;
+    pthread_setaffinity_np;
   }
   GLIBC_2.4 {
     pthread_mutex_consistent_np;
@@ -455,12 +457,11 @@  libpthread {
   }
 
   GLIBC_2.3.3 {
-    pthread_setaffinity_np;
+    __libpthread_version_placeholder;
   }
 
   GLIBC_2.3.4 {
     pthread_getaffinity_np;
-    pthread_setaffinity_np;
     pthread_setschedprio;
   }
 
diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c
index 18069870d1..a0c0102fd8 100644
--- a/nptl/libpthread-compat.c
+++ b/nptl/libpthread-compat.c
@@ -70,6 +70,11 @@  compat_symbol (libpthread, __libpthread_version_placeholder_1,
 	       __libpthread_version_placeholder, GLIBC_2_3_2);
 #endif
 
+#if (SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4))
+compat_symbol (libpthread, __libpthread_version_placeholder_1,
+	       __libpthread_version_placeholder, GLIBC_2_3_3);
+#endif
+
 #if (SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_5))
 compat_symbol (libpthread, __libpthread_version_placeholder_1,
 	       __libpthread_version_placeholder, GLIBC_2_4);
diff --git a/nptl/pthread_setaffinity.c b/nptl/pthread_setaffinity.c
index e0226ea890..3bfdc63e19 100644
--- a/nptl/pthread_setaffinity.c
+++ b/nptl/pthread_setaffinity.c
@@ -37,11 +37,15 @@  __pthread_setaffinity_new (pthread_t th, size_t cpusetsize,
 	  ? INTERNAL_SYSCALL_ERRNO (res)
 	  : 0);
 }
-versioned_symbol (libpthread, __pthread_setaffinity_new,
-		  pthread_setaffinity_np, GLIBC_2_3_4);
+versioned_symbol (libc, __pthread_setaffinity_new,
+		  pthread_setaffinity_np, GLIBC_2_34);
 
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_4, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_setaffinity_new,
+	       pthread_setaffinity_np, GLIBC_2_3_4);
+#endif
 
-#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
 int
 __pthread_setaffinity_old (pthread_t th, cpu_set_t *cpuset)
 {
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index a0043fcc72..5a0899fe90 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1546,6 +1546,7 @@  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_self 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
@@ -2412,6 +2413,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 8245b4910a..0272714fce 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.17 __errno_location F
 GLIBC_2.17 pthread_create F
-GLIBC_2.17 pthread_setaffinity_np F
 GLIBC_2.17 pthread_setname_np F
 GLIBC_2.17 pthread_setschedprio F
 GLIBC_2.17 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 1409f32c5e..25d8603bc0 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2307,6 +2307,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2358,6 +2359,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2502,6 +2504,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 3a8fce8fc2..7b143cd3d7 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -11,8 +11,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index a780f261bd..088f9056c6 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1491,6 +1491,7 @@  GLIBC_2.32 pthread_rwlockattr_init F
 GLIBC_2.32 pthread_rwlockattr_setkind_np F
 GLIBC_2.32 pthread_rwlockattr_setpshared F
 GLIBC_2.32 pthread_self 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
@@ -2171,6 +2172,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
index dff4c4d2ae..5e1f4425f2 100644
--- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.32 __errno_location F
 GLIBC_2.32 pthread_create F
-GLIBC_2.32 pthread_setaffinity_np F
 GLIBC_2.32 pthread_setname_np F
 GLIBC_2.32 pthread_setschedprio F
 GLIBC_2.32 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 3c4439d0fd..afee2d9bb9 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -280,6 +280,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
@@ -1787,6 +1788,7 @@  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_self 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
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 9459d1f7fb..e4421d1661 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -7,5 +7,4 @@  GLIBC_2.31 __libpthread_version_placeholder F
 GLIBC_2.4 __errno_location F
 GLIBC_2.4 __libpthread_version_placeholder F
 GLIBC_2.4 pthread_create F
-GLIBC_2.4 pthread_setaffinity_np F
 GLIBC_2.4 pthread_setschedprio F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 05174f6fb0..e360433660 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -277,6 +277,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
@@ -1784,6 +1785,7 @@  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_self 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
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 9459d1f7fb..e4421d1661 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -7,5 +7,4 @@  GLIBC_2.31 __libpthread_version_placeholder F
 GLIBC_2.4 __errno_location F
 GLIBC_2.4 __libpthread_version_placeholder F
 GLIBC_2.4 pthread_create F
-GLIBC_2.4 pthread_setaffinity_np F
 GLIBC_2.4 pthread_setschedprio F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index 515dc54d6a..5f0d74c38b 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -1547,6 +1547,7 @@  GLIBC_2.29 pthread_rwlockattr_init F
 GLIBC_2.29 pthread_rwlockattr_setkind_np F
 GLIBC_2.29 pthread_rwlockattr_setpshared F
 GLIBC_2.29 pthread_self 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
@@ -2355,6 +2356,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index ba9e21e735..976476e6b0 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.29 __errno_location F
 GLIBC_2.29 pthread_create F
-GLIBC_2.29 pthread_setaffinity_np F
 GLIBC_2.29 pthread_setname_np F
 GLIBC_2.29 pthread_setschedprio F
 GLIBC_2.29 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 78e104a073..f050474ba0 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -2142,6 +2142,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2175,6 +2176,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2307,6 +2309,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index 6b97d836ef..f301ecb383 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -7,8 +7,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index e713095510..515d3af6f5 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -2322,6 +2322,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2355,6 +2356,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2490,6 +2492,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index 3a8fce8fc2..7b143cd3d7 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -11,8 +11,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index f1eb533894..1cd3220ff4 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -2175,6 +2175,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2210,6 +2211,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2343,6 +2345,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 6b97d836ef..f301ecb383 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -7,8 +7,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 97efbfdd91..3f9003bf89 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -281,6 +281,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
@@ -1767,6 +1768,7 @@  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_self 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
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 9459d1f7fb..e4421d1661 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -7,5 +7,4 @@  GLIBC_2.31 __libpthread_version_placeholder F
 GLIBC_2.4 __errno_location F
 GLIBC_2.4 __libpthread_version_placeholder F
 GLIBC_2.4 pthread_create F
-GLIBC_2.4 pthread_setaffinity_np F
 GLIBC_2.4 pthread_setschedprio F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index a242798112..013e5de06d 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -2265,6 +2265,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2298,6 +2299,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2433,6 +2435,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index 3a8fce8fc2..7b143cd3d7 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -11,8 +11,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index ed8e1cd0d5..1df55eb788 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -1549,6 +1549,7 @@  GLIBC_2.18 pthread_rwlockattr_init F
 GLIBC_2.18 pthread_rwlockattr_setkind_np F
 GLIBC_2.18 pthread_rwlockattr_setpshared F
 GLIBC_2.18 pthread_self 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
@@ -2406,6 +2407,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index e4c2d2c0fe..44cc2080c2 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.18 __errno_location F
 GLIBC_2.18 pthread_create F
-GLIBC_2.18 pthread_setaffinity_np F
 GLIBC_2.18 pthread_setname_np F
 GLIBC_2.18 pthread_setschedprio F
 GLIBC_2.18 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 71c563bc1d..b397b1cbee 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -1549,6 +1549,7 @@  GLIBC_2.18 pthread_rwlockattr_init F
 GLIBC_2.18 pthread_rwlockattr_setkind_np F
 GLIBC_2.18 pthread_rwlockattr_setpshared F
 GLIBC_2.18 pthread_self 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
@@ -2403,6 +2404,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index e4c2d2c0fe..44cc2080c2 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.18 __errno_location F
 GLIBC_2.18 pthread_create F
-GLIBC_2.18 pthread_setaffinity_np F
 GLIBC_2.18 pthread_setname_np F
 GLIBC_2.18 pthread_setschedprio F
 GLIBC_2.18 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index de345aa521..0b366d487f 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -2233,6 +2233,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2266,6 +2267,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2398,6 +2400,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 8827ba7772..c884dfc6ae 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -8,8 +8,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 5ace56265c..8361b430df 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -2231,6 +2231,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2264,6 +2265,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2396,6 +2398,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 8827ba7772..c884dfc6ae 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -8,8 +8,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 31acf12768..642ce9dceb 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -2239,6 +2239,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2272,6 +2273,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2404,6 +2406,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 4d5e4e9dd4..48632de397 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -2231,6 +2231,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2266,6 +2267,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2398,6 +2400,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index 2176d0e6e4..125fe4d799 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -1592,6 +1592,7 @@  GLIBC_2.21 pthread_rwlockattr_init F
 GLIBC_2.21 pthread_rwlockattr_setkind_np F
 GLIBC_2.21 pthread_rwlockattr_setpshared F
 GLIBC_2.21 pthread_self 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
@@ -2445,6 +2446,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 9009a98b88..3f25a85a5f 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.21 __errno_location F
 GLIBC_2.21 pthread_create F
-GLIBC_2.21 pthread_setaffinity_np F
 GLIBC_2.21 pthread_setname_np F
 GLIBC_2.21 pthread_setschedprio F
 GLIBC_2.21 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 3abd4e065f..893c46b74a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -2271,6 +2271,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2312,6 +2313,7 @@  GLIBC_2.3.4 makecontext F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2460,6 +2462,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index a5c6a8d42f..7d6a83c3af 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -11,8 +11,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 67db071d92..5b828687bf 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -2304,6 +2304,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2345,6 +2346,7 @@  GLIBC_2.3.4 makecontext F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2493,6 +2495,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index a2b923bcb2..3e7677e070 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -2120,6 +2120,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2160,6 +2161,7 @@  GLIBC_2.3.4 longjmp F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2308,6 +2310,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 8b55edb1b4..1d08bd8e73 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -5,8 +5,7 @@  GLIBC_2.28 thrd_create F
 GLIBC_2.3 __errno_location F
 GLIBC_2.3 pthread_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 2827acac75..4b29564e00 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -1634,6 +1634,7 @@  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_self 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
@@ -2608,6 +2609,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 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 8245b4910a..0272714fce 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.17 __errno_location F
 GLIBC_2.17 pthread_create F
-GLIBC_2.17 pthread_setaffinity_np F
 GLIBC_2.17 pthread_setname_np F
 GLIBC_2.17 pthread_setschedprio F
 GLIBC_2.17 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index d26c0b603e..ba876fc418 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -1493,6 +1493,7 @@  GLIBC_2.33 pthread_rwlockattr_init F
 GLIBC_2.33 pthread_rwlockattr_setkind_np F
 GLIBC_2.33 pthread_rwlockattr_setpshared F
 GLIBC_2.33 pthread_self 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
@@ -2173,6 +2174,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
index b1f30a796c..86594445c3 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.33 __errno_location F
 GLIBC_2.33 pthread_create F
-GLIBC_2.33 pthread_setaffinity_np F
 GLIBC_2.33 pthread_setname_np F
 GLIBC_2.33 pthread_setschedprio F
 GLIBC_2.33 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index 7e77123dec..6f45a3ebd6 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -1537,6 +1537,7 @@  GLIBC_2.27 pthread_rwlockattr_init F
 GLIBC_2.27 pthread_rwlockattr_setkind_np F
 GLIBC_2.27 pthread_rwlockattr_setpshared F
 GLIBC_2.27 pthread_self 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
@@ -2373,6 +2374,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index e1c2320d40..2f58bb845c 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.27 __errno_location F
 GLIBC_2.27 pthread_create F
-GLIBC_2.27 pthread_setaffinity_np F
 GLIBC_2.27 pthread_setname_np F
 GLIBC_2.27 pthread_setschedprio F
 GLIBC_2.27 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index f077792865..ea42d4f420 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -2278,6 +2278,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2311,6 +2312,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2458,6 +2460,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index a084421929..12048bef37 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -12,8 +12,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 1e103ce570..811121dbb9 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -2166,6 +2166,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2201,6 +2202,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2345,6 +2347,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 68f74e182f..c685c20bf7 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -8,8 +8,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index 5644da2e1d..85d2b2c13f 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -2146,6 +2146,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2179,6 +2180,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2314,6 +2316,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index 6b97d836ef..f301ecb383 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -7,8 +7,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 7b9badf6b1..d3429b6d96 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -2146,6 +2146,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2179,6 +2180,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2311,6 +2313,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index 6b97d836ef..f301ecb383 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -7,8 +7,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 0ab8427a30..be5a5aabd5 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -2274,6 +2274,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2307,6 +2308,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2451,6 +2453,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 3a8fce8fc2..7b143cd3d7 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -11,8 +11,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index c1aa8d592e..8e88035ee6 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -2197,6 +2197,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2232,6 +2233,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2364,6 +2366,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 6b97d836ef..f301ecb383 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -7,8 +7,7 @@  GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 68d829d128..18eaaad847 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -2154,6 +2154,7 @@  GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
+GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.3 remap_file_pages F
@@ -2189,6 +2190,7 @@  GLIBC_2.3.4 getsourcefilter F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
+GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 regexec F
 GLIBC_2.3.4 sched_getaffinity F
 GLIBC_2.3.4 sched_setaffinity F
@@ -2323,6 +2325,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 pthread_setspecific F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index a0954fccc5..0759d42083 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -6,8 +6,7 @@  GLIBC_2.2.5 pthread_create F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.3.2 __libpthread_version_placeholder F
-GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_setaffinity_np F
+GLIBC_2.3.3 __libpthread_version_placeholder F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index f4364769c7..6b754260c7 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -1553,6 +1553,7 @@  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_self 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
@@ -2427,6 +2428,7 @@  GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
 GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_rwlockattr_setpshared F
+GLIBC_2.34 pthread_setaffinity_np F
 GLIBC_2.34 pthread_setattr_default_np F
 GLIBC_2.34 pthread_setconcurrency F
 GLIBC_2.34 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 c8f7f67b98..1e6013cfe6 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -1,6 +1,5 @@ 
 GLIBC_2.16 __errno_location F
 GLIBC_2.16 pthread_create F
-GLIBC_2.16 pthread_setaffinity_np F
 GLIBC_2.16 pthread_setname_np F
 GLIBC_2.16 pthread_setschedprio F
 GLIBC_2.16 pthread_sigqueue F