[08/13] nptl: Move pthread_condattr_init implementation into libc

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

Commit Message

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

  <https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>
---
 nptl/Makefile                                                   | 2 +-
 nptl/Versions                                                   | 2 --
 nptl/forward.c                                                  | 2 --
 nptl/nptl-init.c                                                | 1 -
 sysdeps/nptl/pthread-functions.h                                | 1 -
 sysdeps/unix/sysv/linux/aarch64/libpthread.abilist              | 1 -
 sysdeps/unix/sysv/linux/alpha/libpthread.abilist                | 1 -
 sysdeps/unix/sysv/linux/arm/be/libpthread.abilist               | 1 -
 sysdeps/unix/sysv/linux/arm/le/libpthread.abilist               | 1 -
 sysdeps/unix/sysv/linux/csky/libpthread.abilist                 | 1 -
 sysdeps/unix/sysv/linux/hppa/libpthread.abilist                 | 1 -
 sysdeps/unix/sysv/linux/i386/libpthread.abilist                 | 1 -
 sysdeps/unix/sysv/linux/ia64/libpthread.abilist                 | 1 -
 sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist        | 1 -
 sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist          | 1 -
 sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist        | 1 -
 sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist        | 1 -
 sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist          | 1 -
 sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist          | 1 -
 sysdeps/unix/sysv/linux/nios2/libpthread.abilist                | 1 -
 sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist    | 1 -
 sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 1 -
 sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 1 -
 sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist           | 1 -
 sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist         | 1 -
 sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist         | 1 -
 sysdeps/unix/sysv/linux/sh/be/libpthread.abilist                | 1 -
 sysdeps/unix/sysv/linux/sh/le/libpthread.abilist                | 1 -
 sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist        | 1 -
 sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist        | 1 -
 sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist            | 1 -
 sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist           | 1 -
 32 files changed, 1 insertion(+), 34 deletions(-)

-- 
2.24.1

Comments

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

> 

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



LGTM, thanks.

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


> ---

>  nptl/Makefile                                                   | 2 +-

>  nptl/Versions                                                   | 2 --

>  nptl/forward.c                                                  | 2 --

>  nptl/nptl-init.c                                                | 1 -

>  sysdeps/nptl/pthread-functions.h                                | 1 -

>  sysdeps/unix/sysv/linux/aarch64/libpthread.abilist              | 1 -

>  sysdeps/unix/sysv/linux/alpha/libpthread.abilist                | 1 -

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

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

>  sysdeps/unix/sysv/linux/csky/libpthread.abilist                 | 1 -

>  sysdeps/unix/sysv/linux/hppa/libpthread.abilist                 | 1 -

>  sysdeps/unix/sysv/linux/i386/libpthread.abilist                 | 1 -

>  sysdeps/unix/sysv/linux/ia64/libpthread.abilist                 | 1 -

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

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

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

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

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

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

>  sysdeps/unix/sysv/linux/nios2/libpthread.abilist                | 1 -

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

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

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

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

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

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

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

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

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

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

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

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

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

> 

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

> index 3102b839eb..b14a64e693 100644

> --- a/nptl/Makefile

> +++ b/nptl/Makefile

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

>    pthread_attr_setschedpolicy \

>    pthread_attr_setscope \

>    pthread_condattr_destroy \

> +  pthread_condattr_init \

>    pthread_equal \

>    pthread_self \

>    register-atfork \


Ok.

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

>  		      old_pthread_cond_init old_pthread_cond_destroy \

>  		      old_pthread_cond_wait old_pthread_cond_timedwait \

>  		      old_pthread_cond_signal old_pthread_cond_broadcast \

> -		      pthread_condattr_init \

>  		      pthread_condattr_getpshared pthread_condattr_setpshared \

>  		      pthread_condattr_getclock pthread_condattr_setclock \

>  		      pthread_spin_init pthread_spin_destroy \


Ok.

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

> index 22dc309522..bc1bad0562 100644

> --- a/nptl/Versions

> +++ b/nptl/Versions

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

>      pthread_cond_wait; pthread_cond_timedwait;

>      pthread_cond_signal; pthread_cond_broadcast;

>  

> -    pthread_condattr_init;

> -

>      pthread_cancel; pthread_testcancel;

>      pthread_setcancelstate; pthread_setcanceltype;

>  


Ok.

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

> index cf32d8cd3c..9383ada753 100644

> --- a/nptl/forward.c

> +++ b/nptl/forward.c

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

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

>  

>  

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

> -

>  #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)

>  FORWARD2 (__pthread_cond_broadcast_2_0, int attribute_compat_text_section,

>  	  (pthread_cond_2_0_t *cond), (cond), return 0)


Ok.

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

> index d8298d2392..563ab7b1e8 100644

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

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

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

>  #ifdef SHARED

>  static const struct pthread_functions pthread_functions =

>    {

> -    .ptr_pthread_condattr_init = __pthread_condattr_init,

>      .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,

>      .ptr___pthread_cond_destroy = __pthread_cond_destroy,

>      .ptr___pthread_cond_init = __pthread_cond_init,


Ok.

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

> index 165032b2cc..25c05bf4d8 100644

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

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

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

>     the thread functions.  */

>  struct pthread_functions

>  {

> -  int (*ptr_pthread_condattr_init) (pthread_condattr_t *);

>    int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);

>    int (*ptr___pthread_cond_destroy) (pthread_cond_t *);

>    int (*ptr___pthread_cond_init) (pthread_cond_t *,


Ok.

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

> index 4727f24896..d5b247d1bd 100644

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

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

> @@ -93,7 +93,6 @@ GLIBC_2.17 pthread_cond_timedwait F

>  GLIBC_2.17 pthread_cond_wait F

>  GLIBC_2.17 pthread_condattr_getclock F

>  GLIBC_2.17 pthread_condattr_getpshared F

> -GLIBC_2.17 pthread_condattr_init F

>  GLIBC_2.17 pthread_condattr_setclock F

>  GLIBC_2.17 pthread_condattr_setpshared F

>  GLIBC_2.17 pthread_create F

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

> index ff9ad17e83..391be30e38 100644

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

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

> @@ -51,7 +51,6 @@ GLIBC_2.0 pthread_cond_init F

>  GLIBC_2.0 pthread_cond_signal F

>  GLIBC_2.0 pthread_cond_timedwait F

>  GLIBC_2.0 pthread_cond_wait F

> -GLIBC_2.0 pthread_condattr_init F

>  GLIBC_2.0 pthread_create F

>  GLIBC_2.0 pthread_detach F

>  GLIBC_2.0 pthread_exit F

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

> index 686b98104e..862b5d30be 100644

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

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

> @@ -128,7 +128,6 @@ GLIBC_2.4 pthread_cond_timedwait F

>  GLIBC_2.4 pthread_cond_wait F

>  GLIBC_2.4 pthread_condattr_getclock F

>  GLIBC_2.4 pthread_condattr_getpshared F

> -GLIBC_2.4 pthread_condattr_init F

>  GLIBC_2.4 pthread_condattr_setclock F

>  GLIBC_2.4 pthread_condattr_setpshared F

>  GLIBC_2.4 pthread_create F

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

> index 686b98104e..862b5d30be 100644

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

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

> @@ -128,7 +128,6 @@ GLIBC_2.4 pthread_cond_timedwait F

>  GLIBC_2.4 pthread_cond_wait F

>  GLIBC_2.4 pthread_condattr_getclock F

>  GLIBC_2.4 pthread_condattr_getpshared F

> -GLIBC_2.4 pthread_condattr_init F

>  GLIBC_2.4 pthread_condattr_setclock F

>  GLIBC_2.4 pthread_condattr_setpshared F

>  GLIBC_2.4 pthread_create F

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

> index 67138b844b..04559140c9 100644

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

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

> @@ -101,7 +101,6 @@ GLIBC_2.29 pthread_cond_timedwait F

>  GLIBC_2.29 pthread_cond_wait F

>  GLIBC_2.29 pthread_condattr_getclock F

>  GLIBC_2.29 pthread_condattr_getpshared F

> -GLIBC_2.29 pthread_condattr_init F

>  GLIBC_2.29 pthread_condattr_setclock F

>  GLIBC_2.29 pthread_condattr_setpshared F

>  GLIBC_2.29 pthread_create F

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

> index bdc4e1755a..aa0c6d1da0 100644

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

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

> @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_cond_signal F

>  GLIBC_2.2 pthread_cond_timedwait F

>  GLIBC_2.2 pthread_cond_wait F

>  GLIBC_2.2 pthread_condattr_getpshared F

> -GLIBC_2.2 pthread_condattr_init F

>  GLIBC_2.2 pthread_condattr_setpshared F

>  GLIBC_2.2 pthread_create F

>  GLIBC_2.2 pthread_detach F

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

> index 9ae156fd27..b815b155b5 100644

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

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

> @@ -51,7 +51,6 @@ GLIBC_2.0 pthread_cond_init F

>  GLIBC_2.0 pthread_cond_signal F

>  GLIBC_2.0 pthread_cond_timedwait F

>  GLIBC_2.0 pthread_cond_wait F

> -GLIBC_2.0 pthread_condattr_init F

>  GLIBC_2.0 pthread_create F

>  GLIBC_2.0 pthread_detach F

>  GLIBC_2.0 pthread_exit F

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

> index 78cb476094..283e0e6f9d 100644

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

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

> @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_cond_signal F

>  GLIBC_2.2 pthread_cond_timedwait F

>  GLIBC_2.2 pthread_cond_wait F

>  GLIBC_2.2 pthread_condattr_getpshared F

> -GLIBC_2.2 pthread_condattr_init F

>  GLIBC_2.2 pthread_condattr_setpshared F

>  GLIBC_2.2 pthread_create F

>  GLIBC_2.2 pthread_detach F

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

> index 686b98104e..862b5d30be 100644

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

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

> @@ -128,7 +128,6 @@ GLIBC_2.4 pthread_cond_timedwait F

>  GLIBC_2.4 pthread_cond_wait F

>  GLIBC_2.4 pthread_condattr_getclock F

>  GLIBC_2.4 pthread_condattr_getpshared F

> -GLIBC_2.4 pthread_condattr_init F

>  GLIBC_2.4 pthread_condattr_setclock F

>  GLIBC_2.4 pthread_condattr_setpshared F

>  GLIBC_2.4 pthread_create F

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

> index 9ae156fd27..b815b155b5 100644

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

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

> @@ -51,7 +51,6 @@ GLIBC_2.0 pthread_cond_init F

>  GLIBC_2.0 pthread_cond_signal F

>  GLIBC_2.0 pthread_cond_timedwait F

>  GLIBC_2.0 pthread_cond_wait F

> -GLIBC_2.0 pthread_condattr_init F

>  GLIBC_2.0 pthread_create F

>  GLIBC_2.0 pthread_detach F

>  GLIBC_2.0 pthread_exit F

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

> index b819c21dcb..e1ffc40cd9 100644

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

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

> @@ -93,7 +93,6 @@ GLIBC_2.18 pthread_cond_timedwait F

>  GLIBC_2.18 pthread_cond_wait F

>  GLIBC_2.18 pthread_condattr_getclock F

>  GLIBC_2.18 pthread_condattr_getpshared F

> -GLIBC_2.18 pthread_condattr_init F

>  GLIBC_2.18 pthread_condattr_setclock F

>  GLIBC_2.18 pthread_condattr_setpshared F

>  GLIBC_2.18 pthread_create F

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

> index b819c21dcb..e1ffc40cd9 100644

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

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

> @@ -93,7 +93,6 @@ GLIBC_2.18 pthread_cond_timedwait F

>  GLIBC_2.18 pthread_cond_wait F

>  GLIBC_2.18 pthread_condattr_getclock F

>  GLIBC_2.18 pthread_condattr_getpshared F

> -GLIBC_2.18 pthread_condattr_init F

>  GLIBC_2.18 pthread_condattr_setclock F

>  GLIBC_2.18 pthread_condattr_setpshared F

>  GLIBC_2.18 pthread_create F

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

> index 404b7f8868..70169b45b4 100644

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

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

> @@ -51,7 +51,6 @@ GLIBC_2.0 pthread_cond_init F

>  GLIBC_2.0 pthread_cond_signal F

>  GLIBC_2.0 pthread_cond_timedwait F

>  GLIBC_2.0 pthread_cond_wait F

> -GLIBC_2.0 pthread_condattr_init F

>  GLIBC_2.0 pthread_create F

>  GLIBC_2.0 pthread_detach F

>  GLIBC_2.0 pthread_exit F

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

> index 404b7f8868..70169b45b4 100644

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

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

> @@ -51,7 +51,6 @@ GLIBC_2.0 pthread_cond_init F

>  GLIBC_2.0 pthread_cond_signal F

>  GLIBC_2.0 pthread_cond_timedwait F

>  GLIBC_2.0 pthread_cond_wait F

> -GLIBC_2.0 pthread_condattr_init F

>  GLIBC_2.0 pthread_create F

>  GLIBC_2.0 pthread_detach F

>  GLIBC_2.0 pthread_exit F

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

> index 8710edf723..6baae4309c 100644

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

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

> @@ -93,7 +93,6 @@ GLIBC_2.21 pthread_cond_timedwait F

>  GLIBC_2.21 pthread_cond_wait F

>  GLIBC_2.21 pthread_condattr_getclock F

>  GLIBC_2.21 pthread_condattr_getpshared F

> -GLIBC_2.21 pthread_condattr_init F

>  GLIBC_2.21 pthread_condattr_setclock F

>  GLIBC_2.21 pthread_condattr_setpshared F

>  GLIBC_2.21 pthread_create F

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

> index b42ad93959..0dd3739a03 100644

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

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

> @@ -51,7 +51,6 @@ GLIBC_2.0 pthread_cond_init F

>  GLIBC_2.0 pthread_cond_signal F

>  GLIBC_2.0 pthread_cond_timedwait F

>  GLIBC_2.0 pthread_cond_wait F

> -GLIBC_2.0 pthread_condattr_init F

>  GLIBC_2.0 pthread_create F

>  GLIBC_2.0 pthread_detach F

>  GLIBC_2.0 pthread_exit F

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

> index 86430a78ac..8d4fa60131 100644

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

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

> @@ -112,7 +112,6 @@ GLIBC_2.3 pthread_cond_signal F

>  GLIBC_2.3 pthread_cond_timedwait F

>  GLIBC_2.3 pthread_cond_wait F

>  GLIBC_2.3 pthread_condattr_getpshared F

> -GLIBC_2.3 pthread_condattr_init F

>  GLIBC_2.3 pthread_condattr_setpshared F

>  GLIBC_2.3 pthread_create F

>  GLIBC_2.3 pthread_detach F

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

> index 4727f24896..d5b247d1bd 100644

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

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

> @@ -93,7 +93,6 @@ GLIBC_2.17 pthread_cond_timedwait F

>  GLIBC_2.17 pthread_cond_wait F

>  GLIBC_2.17 pthread_condattr_getclock F

>  GLIBC_2.17 pthread_condattr_getpshared F

> -GLIBC_2.17 pthread_condattr_init F

>  GLIBC_2.17 pthread_condattr_setclock F

>  GLIBC_2.17 pthread_condattr_setpshared F

>  GLIBC_2.17 pthread_create F

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

> index cb3a6a8344..e3391617d6 100644

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

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

> @@ -90,7 +90,6 @@ GLIBC_2.27 pthread_cond_timedwait F

>  GLIBC_2.27 pthread_cond_wait F

>  GLIBC_2.27 pthread_condattr_getclock F

>  GLIBC_2.27 pthread_condattr_getpshared F

> -GLIBC_2.27 pthread_condattr_init F

>  GLIBC_2.27 pthread_condattr_setclock F

>  GLIBC_2.27 pthread_condattr_setpshared F

>  GLIBC_2.27 pthread_create F

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

> index 6700046b59..ff80259a92 100644

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

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

> @@ -51,7 +51,6 @@ GLIBC_2.0 pthread_cond_init F

>  GLIBC_2.0 pthread_cond_signal F

>  GLIBC_2.0 pthread_cond_timedwait F

>  GLIBC_2.0 pthread_cond_wait F

> -GLIBC_2.0 pthread_condattr_init F

>  GLIBC_2.0 pthread_create F

>  GLIBC_2.0 pthread_detach F

>  GLIBC_2.0 pthread_exit F

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

> index b9a663c25d..02d7c0409a 100644

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

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

> @@ -94,7 +94,6 @@ GLIBC_2.2 pthread_cond_signal F

>  GLIBC_2.2 pthread_cond_timedwait F

>  GLIBC_2.2 pthread_cond_wait F

>  GLIBC_2.2 pthread_condattr_getpshared F

> -GLIBC_2.2 pthread_condattr_init F

>  GLIBC_2.2 pthread_condattr_setpshared F

>  GLIBC_2.2 pthread_create F

>  GLIBC_2.2 pthread_detach F

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

> index bdc4e1755a..aa0c6d1da0 100644

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

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

> @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_cond_signal F

>  GLIBC_2.2 pthread_cond_timedwait F

>  GLIBC_2.2 pthread_cond_wait F

>  GLIBC_2.2 pthread_condattr_getpshared F

> -GLIBC_2.2 pthread_condattr_init F

>  GLIBC_2.2 pthread_condattr_setpshared F

>  GLIBC_2.2 pthread_create F

>  GLIBC_2.2 pthread_detach F

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

> index bdc4e1755a..aa0c6d1da0 100644

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

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

> @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_cond_signal F

>  GLIBC_2.2 pthread_cond_timedwait F

>  GLIBC_2.2 pthread_cond_wait F

>  GLIBC_2.2 pthread_condattr_getpshared F

> -GLIBC_2.2 pthread_condattr_init F

>  GLIBC_2.2 pthread_condattr_setpshared F

>  GLIBC_2.2 pthread_create F

>  GLIBC_2.2 pthread_detach F

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

> index ff9ad17e83..391be30e38 100644

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

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

> @@ -51,7 +51,6 @@ GLIBC_2.0 pthread_cond_init F

>  GLIBC_2.0 pthread_cond_signal F

>  GLIBC_2.0 pthread_cond_timedwait F

>  GLIBC_2.0 pthread_cond_wait F

> -GLIBC_2.0 pthread_condattr_init F

>  GLIBC_2.0 pthread_create F

>  GLIBC_2.0 pthread_detach F

>  GLIBC_2.0 pthread_exit F

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

> index 78cb476094..283e0e6f9d 100644

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

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

> @@ -92,7 +92,6 @@ GLIBC_2.2 pthread_cond_signal F

>  GLIBC_2.2 pthread_cond_timedwait F

>  GLIBC_2.2 pthread_cond_wait F

>  GLIBC_2.2 pthread_condattr_getpshared F

> -GLIBC_2.2 pthread_condattr_init F

>  GLIBC_2.2 pthread_condattr_setpshared F

>  GLIBC_2.2 pthread_create F

>  GLIBC_2.2 pthread_detach F

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

> index 12b8d05921..35835c89d9 100644

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

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

> @@ -92,7 +92,6 @@ GLIBC_2.2.5 pthread_cond_signal F

>  GLIBC_2.2.5 pthread_cond_timedwait F

>  GLIBC_2.2.5 pthread_cond_wait F

>  GLIBC_2.2.5 pthread_condattr_getpshared F

> -GLIBC_2.2.5 pthread_condattr_init F

>  GLIBC_2.2.5 pthread_condattr_setpshared F

>  GLIBC_2.2.5 pthread_create F

>  GLIBC_2.2.5 pthread_detach F

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

> index 451a473a58..4b27550ad0 100644

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

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

> @@ -93,7 +93,6 @@ GLIBC_2.16 pthread_cond_timedwait F

>  GLIBC_2.16 pthread_cond_wait F

>  GLIBC_2.16 pthread_condattr_getclock F

>  GLIBC_2.16 pthread_condattr_getpshared F

> -GLIBC_2.16 pthread_condattr_init F

>  GLIBC_2.16 pthread_condattr_setclock F

>  GLIBC_2.16 pthread_condattr_setpshared F

>  GLIBC_2.16 pthread_create F

> 


Ok.

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index 3102b839eb..b14a64e693 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -50,6 +50,7 @@  routines = \
   pthread_attr_setschedpolicy \
   pthread_attr_setscope \
   pthread_condattr_destroy \
+  pthread_condattr_init \
   pthread_equal \
   pthread_self \
   register-atfork \
@@ -107,7 +108,6 @@  libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      old_pthread_cond_init old_pthread_cond_destroy \
 		      old_pthread_cond_wait old_pthread_cond_timedwait \
 		      old_pthread_cond_signal old_pthread_cond_broadcast \
-		      pthread_condattr_init \
 		      pthread_condattr_getpshared pthread_condattr_setpshared \
 		      pthread_condattr_getclock pthread_condattr_setclock \
 		      pthread_spin_init pthread_spin_destroy \
diff --git a/nptl/Versions b/nptl/Versions
index 22dc309522..bc1bad0562 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -58,8 +58,6 @@  libpthread {
     pthread_cond_wait; pthread_cond_timedwait;
     pthread_cond_signal; pthread_cond_broadcast;
 
-    pthread_condattr_init;
-
     pthread_cancel; pthread_testcancel;
     pthread_setcancelstate; pthread_setcanceltype;
 
diff --git a/nptl/forward.c b/nptl/forward.c
index cf32d8cd3c..9383ada753 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -56,8 +56,6 @@  name decl								      \
   FORWARD2 (name, int, decl, params, return defretval)
 
 
-FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
-
 #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 FORWARD2 (__pthread_cond_broadcast_2_0, int attribute_compat_text_section,
 	  (pthread_cond_2_0_t *cond), (cond), return 0)
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index d8298d2392..563ab7b1e8 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -72,7 +72,6 @@  void __nptl_set_robust (struct pthread *);
 #ifdef SHARED
 static const struct pthread_functions pthread_functions =
   {
-    .ptr_pthread_condattr_init = __pthread_condattr_init,
     .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
     .ptr___pthread_cond_destroy = __pthread_cond_destroy,
     .ptr___pthread_cond_init = __pthread_cond_init,
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 165032b2cc..25c05bf4d8 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -30,7 +30,6 @@  struct xid_command;
    the thread functions.  */
 struct pthread_functions
 {
-  int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
   int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
   int (*ptr___pthread_cond_destroy) (pthread_cond_t *);
   int (*ptr___pthread_cond_init) (pthread_cond_t *,
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 4727f24896..d5b247d1bd 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -93,7 +93,6 @@  GLIBC_2.17 pthread_cond_timedwait F
 GLIBC_2.17 pthread_cond_wait F
 GLIBC_2.17 pthread_condattr_getclock F
 GLIBC_2.17 pthread_condattr_getpshared F
-GLIBC_2.17 pthread_condattr_init F
 GLIBC_2.17 pthread_condattr_setclock F
 GLIBC_2.17 pthread_condattr_setpshared F
 GLIBC_2.17 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index ff9ad17e83..391be30e38 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -51,7 +51,6 @@  GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
 GLIBC_2.0 pthread_cond_wait F
-GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 686b98104e..862b5d30be 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -128,7 +128,6 @@  GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
-GLIBC_2.4 pthread_condattr_init F
 GLIBC_2.4 pthread_condattr_setclock F
 GLIBC_2.4 pthread_condattr_setpshared F
 GLIBC_2.4 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 686b98104e..862b5d30be 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -128,7 +128,6 @@  GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
-GLIBC_2.4 pthread_condattr_init F
 GLIBC_2.4 pthread_condattr_setclock F
 GLIBC_2.4 pthread_condattr_setpshared F
 GLIBC_2.4 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 67138b844b..04559140c9 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -101,7 +101,6 @@  GLIBC_2.29 pthread_cond_timedwait F
 GLIBC_2.29 pthread_cond_wait F
 GLIBC_2.29 pthread_condattr_getclock F
 GLIBC_2.29 pthread_condattr_getpshared F
-GLIBC_2.29 pthread_condattr_init F
 GLIBC_2.29 pthread_condattr_setclock F
 GLIBC_2.29 pthread_condattr_setpshared F
 GLIBC_2.29 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index bdc4e1755a..aa0c6d1da0 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -92,7 +92,6 @@  GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
-GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index 9ae156fd27..b815b155b5 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -51,7 +51,6 @@  GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
 GLIBC_2.0 pthread_cond_wait F
-GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 78cb476094..283e0e6f9d 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -92,7 +92,6 @@  GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
-GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 686b98104e..862b5d30be 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -128,7 +128,6 @@  GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
-GLIBC_2.4 pthread_condattr_init F
 GLIBC_2.4 pthread_condattr_setclock F
 GLIBC_2.4 pthread_condattr_setpshared F
 GLIBC_2.4 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index 9ae156fd27..b815b155b5 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -51,7 +51,6 @@  GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
 GLIBC_2.0 pthread_cond_wait F
-GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index b819c21dcb..e1ffc40cd9 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -93,7 +93,6 @@  GLIBC_2.18 pthread_cond_timedwait F
 GLIBC_2.18 pthread_cond_wait F
 GLIBC_2.18 pthread_condattr_getclock F
 GLIBC_2.18 pthread_condattr_getpshared F
-GLIBC_2.18 pthread_condattr_init F
 GLIBC_2.18 pthread_condattr_setclock F
 GLIBC_2.18 pthread_condattr_setpshared F
 GLIBC_2.18 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index b819c21dcb..e1ffc40cd9 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -93,7 +93,6 @@  GLIBC_2.18 pthread_cond_timedwait F
 GLIBC_2.18 pthread_cond_wait F
 GLIBC_2.18 pthread_condattr_getclock F
 GLIBC_2.18 pthread_condattr_getpshared F
-GLIBC_2.18 pthread_condattr_init F
 GLIBC_2.18 pthread_condattr_setclock F
 GLIBC_2.18 pthread_condattr_setpshared F
 GLIBC_2.18 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 404b7f8868..70169b45b4 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -51,7 +51,6 @@  GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
 GLIBC_2.0 pthread_cond_wait F
-GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 404b7f8868..70169b45b4 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -51,7 +51,6 @@  GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
 GLIBC_2.0 pthread_cond_wait F
-GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 8710edf723..6baae4309c 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -93,7 +93,6 @@  GLIBC_2.21 pthread_cond_timedwait F
 GLIBC_2.21 pthread_cond_wait F
 GLIBC_2.21 pthread_condattr_getclock F
 GLIBC_2.21 pthread_condattr_getpshared F
-GLIBC_2.21 pthread_condattr_init F
 GLIBC_2.21 pthread_condattr_setclock F
 GLIBC_2.21 pthread_condattr_setpshared F
 GLIBC_2.21 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index b42ad93959..0dd3739a03 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -51,7 +51,6 @@  GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
 GLIBC_2.0 pthread_cond_wait F
-GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 86430a78ac..8d4fa60131 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -112,7 +112,6 @@  GLIBC_2.3 pthread_cond_signal F
 GLIBC_2.3 pthread_cond_timedwait F
 GLIBC_2.3 pthread_cond_wait F
 GLIBC_2.3 pthread_condattr_getpshared F
-GLIBC_2.3 pthread_condattr_init F
 GLIBC_2.3 pthread_condattr_setpshared F
 GLIBC_2.3 pthread_create F
 GLIBC_2.3 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index 4727f24896..d5b247d1bd 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -93,7 +93,6 @@  GLIBC_2.17 pthread_cond_timedwait F
 GLIBC_2.17 pthread_cond_wait F
 GLIBC_2.17 pthread_condattr_getclock F
 GLIBC_2.17 pthread_condattr_getpshared F
-GLIBC_2.17 pthread_condattr_init F
 GLIBC_2.17 pthread_condattr_setclock F
 GLIBC_2.17 pthread_condattr_setpshared F
 GLIBC_2.17 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index cb3a6a8344..e3391617d6 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -90,7 +90,6 @@  GLIBC_2.27 pthread_cond_timedwait F
 GLIBC_2.27 pthread_cond_wait F
 GLIBC_2.27 pthread_condattr_getclock F
 GLIBC_2.27 pthread_condattr_getpshared F
-GLIBC_2.27 pthread_condattr_init F
 GLIBC_2.27 pthread_condattr_setclock F
 GLIBC_2.27 pthread_condattr_setpshared F
 GLIBC_2.27 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index 6700046b59..ff80259a92 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -51,7 +51,6 @@  GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
 GLIBC_2.0 pthread_cond_wait F
-GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index b9a663c25d..02d7c0409a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -94,7 +94,6 @@  GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
-GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index bdc4e1755a..aa0c6d1da0 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -92,7 +92,6 @@  GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
-GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index bdc4e1755a..aa0c6d1da0 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -92,7 +92,6 @@  GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
-GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index ff9ad17e83..391be30e38 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -51,7 +51,6 @@  GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
 GLIBC_2.0 pthread_cond_wait F
-GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 78cb476094..283e0e6f9d 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -92,7 +92,6 @@  GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
-GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 12b8d05921..35835c89d9 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -92,7 +92,6 @@  GLIBC_2.2.5 pthread_cond_signal F
 GLIBC_2.2.5 pthread_cond_timedwait F
 GLIBC_2.2.5 pthread_cond_wait F
 GLIBC_2.2.5 pthread_condattr_getpshared F
-GLIBC_2.2.5 pthread_condattr_init F
 GLIBC_2.2.5 pthread_condattr_setpshared F
 GLIBC_2.2.5 pthread_create F
 GLIBC_2.2.5 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 451a473a58..4b27550ad0 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -93,7 +93,6 @@  GLIBC_2.16 pthread_cond_timedwait F
 GLIBC_2.16 pthread_cond_wait F
 GLIBC_2.16 pthread_condattr_getclock F
 GLIBC_2.16 pthread_condattr_getpshared F
-GLIBC_2.16 pthread_condattr_init F
 GLIBC_2.16 pthread_condattr_setclock F
 GLIBC_2.16 pthread_condattr_setpshared F
 GLIBC_2.16 pthread_create F