[05/13] nptl: Move pthread_attr_getscope implementation into libc
Commit Message
This is part of the libpthread removal project:
<https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>
---
nptl/Makefile | 3 ++-
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 -
.../unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 1 -
.../unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/sh/be/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/sh/le/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 1 -
sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist | 1 -
32 files changed, 3 insertions(+), 33 deletions(-)
Comments
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 | 3 ++-
> 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 -
> .../unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 1 -
> .../unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/sh/be/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/sh/le/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 1 -
> sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist | 1 -
> 32 files changed, 3 insertions(+), 33 deletions(-)
>
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 1964935fa0..9a51922e55 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -42,6 +42,7 @@ routines = \
> pthread_attr_getinheritsched \
> pthread_attr_getschedparam \
> pthread_attr_getschedpolicy \
> + pthread_attr_getscope \
> pthread_attr_init \
> pthread_attr_setdetachstate \
> pthread_attr_setinheritsched \
Ok.
> @@ -74,7 +75,7 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
> pthread_getschedparam pthread_setschedparam \
> pthread_setschedprio \
> pthread_attr_getguardsize pthread_attr_setguardsize \
> - pthread_attr_getscope pthread_attr_setscope \
> + pthread_attr_setscope \
> pthread_attr_getstackaddr pthread_attr_setstackaddr \
> pthread_attr_getstacksize pthread_attr_setstacksize \
> pthread_attr_getstack pthread_attr_setstack \
Ok.
> diff --git a/nptl/Versions b/nptl/Versions
> index ca0a7e62a8..88b4266287 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -49,7 +49,7 @@ libpthread {
>
> pthread_getschedparam; pthread_setschedparam;
>
> - pthread_attr_getscope; pthread_attr_setscope;
> + pthread_attr_setscope;
>
> pthread_mutex_init; pthread_mutex_destroy;
> pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;
Ok.
> diff --git a/nptl/forward.c b/nptl/forward.c
> index 7e7fcf2c59..43f9eb699f 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -56,8 +56,6 @@ name decl \
> FORWARD2 (name, int, decl, params, return defretval)
>
>
> -FORWARD (pthread_attr_getscope,
> - (const pthread_attr_t *attr, int *scope), (attr, scope), 0)
> FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
> (attr, scope), 0)
>
Ok.
> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 9741969c4c..5ccd69341d 100644
> --- a/nptl/nptl-init.c
> +++ b/nptl/nptl-init.c
> @@ -72,7 +72,6 @@ void __nptl_set_robust (struct pthread *);
> #ifdef SHARED
> static const struct pthread_functions pthread_functions =
> {
> - .ptr_pthread_attr_getscope = __pthread_attr_getscope,
> .ptr_pthread_attr_setscope = __pthread_attr_setscope,
> .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
> .ptr_pthread_condattr_init = __pthread_condattr_init,
Ok.
> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 927ac5a706..a38f9d7fc6 100644
> --- a/sysdeps/nptl/pthread-functions.h
> +++ b/sysdeps/nptl/pthread-functions.h
> @@ -30,7 +30,6 @@ struct xid_command;
> the thread functions. */
> struct pthread_functions
> {
> - int (*ptr_pthread_attr_getscope) (const pthread_attr_t *, int *);
> int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);
> int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
> int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 2f3fd8b2a9..1c1eefb3fd 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -69,7 +69,6 @@ GLIBC_2.17 pread F
> GLIBC_2.17 pread64 F
> GLIBC_2.17 pthread_attr_getaffinity_np F
> GLIBC_2.17 pthread_attr_getguardsize F
> -GLIBC_2.17 pthread_attr_getscope F
> GLIBC_2.17 pthread_attr_getstack F
> GLIBC_2.17 pthread_attr_getstackaddr F
> GLIBC_2.17 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 782582e22f..7c971026f3 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getscope F
> GLIBC_2.0 pthread_attr_setscope F
> GLIBC_2.0 pthread_cancel F
> GLIBC_2.0 pthread_cond_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 3802f5d147..1a3cd91b02 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -104,7 +104,6 @@ GLIBC_2.4 pread F
> GLIBC_2.4 pread64 F
> GLIBC_2.4 pthread_attr_getaffinity_np F
> GLIBC_2.4 pthread_attr_getguardsize F
> -GLIBC_2.4 pthread_attr_getscope F
> GLIBC_2.4 pthread_attr_getstack F
> GLIBC_2.4 pthread_attr_getstackaddr F
> GLIBC_2.4 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 3802f5d147..1a3cd91b02 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -104,7 +104,6 @@ GLIBC_2.4 pread F
> GLIBC_2.4 pread64 F
> GLIBC_2.4 pthread_attr_getaffinity_np F
> GLIBC_2.4 pthread_attr_getguardsize F
> -GLIBC_2.4 pthread_attr_getscope F
> GLIBC_2.4 pthread_attr_getstack F
> GLIBC_2.4 pthread_attr_getstackaddr F
> GLIBC_2.4 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 5a787cd973..e201451825 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -77,7 +77,6 @@ GLIBC_2.29 pread F
> GLIBC_2.29 pread64 F
> GLIBC_2.29 pthread_attr_getaffinity_np F
> GLIBC_2.29 pthread_attr_getguardsize F
> -GLIBC_2.29 pthread_attr_getscope F
> GLIBC_2.29 pthread_attr_getstack F
> GLIBC_2.29 pthread_attr_getstackaddr F
> GLIBC_2.29 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index a3ce51c38d..a0759ebc70 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -71,7 +71,6 @@ GLIBC_2.2 pread F
> GLIBC_2.2 pread64 F
> GLIBC_2.2 pthread_atfork F
> GLIBC_2.2 pthread_attr_getguardsize F
> -GLIBC_2.2 pthread_attr_getscope F
> GLIBC_2.2 pthread_attr_getstack F
> GLIBC_2.2 pthread_attr_getstackaddr F
> GLIBC_2.2 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index db97003d8b..dab30e943d 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getscope F
> GLIBC_2.0 pthread_attr_setscope F
> GLIBC_2.0 pthread_cancel F
> GLIBC_2.0 pthread_cond_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index fce31e5cf6..ccf83eb5c2 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -71,7 +71,6 @@ GLIBC_2.2 pread F
> GLIBC_2.2 pread64 F
> GLIBC_2.2 pthread_atfork F
> GLIBC_2.2 pthread_attr_getguardsize F
> -GLIBC_2.2 pthread_attr_getscope F
> GLIBC_2.2 pthread_attr_getstack F
> GLIBC_2.2 pthread_attr_getstackaddr F
> GLIBC_2.2 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 3802f5d147..1a3cd91b02 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -104,7 +104,6 @@ GLIBC_2.4 pread F
> GLIBC_2.4 pread64 F
> GLIBC_2.4 pthread_attr_getaffinity_np F
> GLIBC_2.4 pthread_attr_getguardsize F
> -GLIBC_2.4 pthread_attr_getscope F
> GLIBC_2.4 pthread_attr_getstack F
> GLIBC_2.4 pthread_attr_getstackaddr F
> GLIBC_2.4 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index db97003d8b..dab30e943d 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getscope F
> GLIBC_2.0 pthread_attr_setscope F
> GLIBC_2.0 pthread_cancel F
> GLIBC_2.0 pthread_cond_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index 9bcadbe98b..185936524a 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -69,7 +69,6 @@ GLIBC_2.18 pread F
> GLIBC_2.18 pread64 F
> GLIBC_2.18 pthread_attr_getaffinity_np F
> GLIBC_2.18 pthread_attr_getguardsize F
> -GLIBC_2.18 pthread_attr_getscope F
> GLIBC_2.18 pthread_attr_getstack F
> GLIBC_2.18 pthread_attr_getstackaddr F
> GLIBC_2.18 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index 9bcadbe98b..185936524a 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -69,7 +69,6 @@ GLIBC_2.18 pread F
> GLIBC_2.18 pread64 F
> GLIBC_2.18 pthread_attr_getaffinity_np F
> GLIBC_2.18 pthread_attr_getguardsize F
> -GLIBC_2.18 pthread_attr_getscope F
> GLIBC_2.18 pthread_attr_getstack F
> GLIBC_2.18 pthread_attr_getstackaddr F
> GLIBC_2.18 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 0f9ed9ce97..0a4c17b029 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getscope F
> GLIBC_2.0 pthread_attr_setscope F
> GLIBC_2.0 pthread_cancel F
> GLIBC_2.0 pthread_cond_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 0f9ed9ce97..0a4c17b029 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getscope F
> GLIBC_2.0 pthread_attr_setscope F
> GLIBC_2.0 pthread_cancel F
> GLIBC_2.0 pthread_cond_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 9427133d75..edf8c19b72 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -69,7 +69,6 @@ GLIBC_2.21 pread F
> GLIBC_2.21 pread64 F
> GLIBC_2.21 pthread_attr_getaffinity_np F
> GLIBC_2.21 pthread_attr_getguardsize F
> -GLIBC_2.21 pthread_attr_getscope F
> GLIBC_2.21 pthread_attr_getstack F
> GLIBC_2.21 pthread_attr_getstackaddr F
> GLIBC_2.21 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 8ef7663e56..2e80e3be32 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getscope F
> GLIBC_2.0 pthread_attr_setscope F
> GLIBC_2.0 pthread_cancel F
> GLIBC_2.0 pthread_cond_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index c8374e3ef5..6f12c83064 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.3 pause F
> GLIBC_2.3 pread F
> GLIBC_2.3 pread64 F
> GLIBC_2.3 pthread_attr_getguardsize F
> -GLIBC_2.3 pthread_attr_getscope F
> GLIBC_2.3 pthread_attr_getstack F
> GLIBC_2.3 pthread_attr_getstackaddr F
> GLIBC_2.3 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index 2f3fd8b2a9..1c1eefb3fd 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -69,7 +69,6 @@ GLIBC_2.17 pread F
> GLIBC_2.17 pread64 F
> GLIBC_2.17 pthread_attr_getaffinity_np F
> GLIBC_2.17 pthread_attr_getguardsize F
> -GLIBC_2.17 pthread_attr_getscope F
> GLIBC_2.17 pthread_attr_getstack F
> GLIBC_2.17 pthread_attr_getstackaddr F
> GLIBC_2.17 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 21ad813060..60a6f89b6f 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -66,7 +66,6 @@ GLIBC_2.27 pread F
> GLIBC_2.27 pread64 F
> GLIBC_2.27 pthread_attr_getaffinity_np F
> GLIBC_2.27 pthread_attr_getguardsize F
> -GLIBC_2.27 pthread_attr_getscope F
> GLIBC_2.27 pthread_attr_getstack F
> GLIBC_2.27 pthread_attr_getstackaddr F
> GLIBC_2.27 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index 2535211071..d37af9c62b 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getscope F
> GLIBC_2.0 pthread_attr_setscope F
> GLIBC_2.0 pthread_cancel F
> GLIBC_2.0 pthread_cond_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 820b340f5e..964eb077d9 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -73,7 +73,6 @@ GLIBC_2.2 pread F
> GLIBC_2.2 pread64 F
> GLIBC_2.2 pthread_atfork F
> GLIBC_2.2 pthread_attr_getguardsize F
> -GLIBC_2.2 pthread_attr_getscope F
> GLIBC_2.2 pthread_attr_getstack F
> GLIBC_2.2 pthread_attr_getstackaddr F
> GLIBC_2.2 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index a3ce51c38d..a0759ebc70 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -71,7 +71,6 @@ GLIBC_2.2 pread F
> GLIBC_2.2 pread64 F
> GLIBC_2.2 pthread_atfork F
> GLIBC_2.2 pthread_attr_getguardsize F
> -GLIBC_2.2 pthread_attr_getscope F
> GLIBC_2.2 pthread_attr_getstack F
> GLIBC_2.2 pthread_attr_getstackaddr F
> GLIBC_2.2 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index a3ce51c38d..a0759ebc70 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -71,7 +71,6 @@ GLIBC_2.2 pread F
> GLIBC_2.2 pread64 F
> GLIBC_2.2 pthread_atfork F
> GLIBC_2.2 pthread_attr_getguardsize F
> -GLIBC_2.2 pthread_attr_getscope F
> GLIBC_2.2 pthread_attr_getstack F
> GLIBC_2.2 pthread_attr_getstackaddr F
> GLIBC_2.2 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 782582e22f..7c971026f3 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -44,7 +44,6 @@ GLIBC_2.0 msync F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getscope F
> GLIBC_2.0 pthread_attr_setscope F
> GLIBC_2.0 pthread_cancel F
> GLIBC_2.0 pthread_cond_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index fce31e5cf6..ccf83eb5c2 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -71,7 +71,6 @@ GLIBC_2.2 pread F
> GLIBC_2.2 pread64 F
> GLIBC_2.2 pthread_atfork F
> GLIBC_2.2 pthread_attr_getguardsize F
> -GLIBC_2.2 pthread_attr_getscope F
> GLIBC_2.2 pthread_attr_getstack F
> GLIBC_2.2 pthread_attr_getstackaddr F
> GLIBC_2.2 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index a5ad630f1e..0a4c6b3361 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -71,7 +71,6 @@ GLIBC_2.2.5 pread F
> GLIBC_2.2.5 pread64 F
> GLIBC_2.2.5 pthread_atfork F
> GLIBC_2.2.5 pthread_attr_getguardsize F
> -GLIBC_2.2.5 pthread_attr_getscope F
> GLIBC_2.2.5 pthread_attr_getstack F
> GLIBC_2.2.5 pthread_attr_getstackaddr F
> GLIBC_2.2.5 pthread_attr_getstacksize F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 595ca1a710..35352d5b3f 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -69,7 +69,6 @@ GLIBC_2.16 pread F
> GLIBC_2.16 pread64 F
> GLIBC_2.16 pthread_attr_getaffinity_np F
> GLIBC_2.16 pthread_attr_getguardsize F
> -GLIBC_2.16 pthread_attr_getscope F
> GLIBC_2.16 pthread_attr_getstack F
> GLIBC_2.16 pthread_attr_getstackaddr F
> GLIBC_2.16 pthread_attr_getstacksize F
>
Ok.
@@ -42,6 +42,7 @@ routines = \
pthread_attr_getinheritsched \
pthread_attr_getschedparam \
pthread_attr_getschedpolicy \
+ pthread_attr_getscope \
pthread_attr_init \
pthread_attr_setdetachstate \
pthread_attr_setinheritsched \
@@ -74,7 +75,7 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
pthread_getschedparam pthread_setschedparam \
pthread_setschedprio \
pthread_attr_getguardsize pthread_attr_setguardsize \
- pthread_attr_getscope pthread_attr_setscope \
+ pthread_attr_setscope \
pthread_attr_getstackaddr pthread_attr_setstackaddr \
pthread_attr_getstacksize pthread_attr_setstacksize \
pthread_attr_getstack pthread_attr_setstack \
@@ -49,7 +49,7 @@ libpthread {
pthread_getschedparam; pthread_setschedparam;
- pthread_attr_getscope; pthread_attr_setscope;
+ pthread_attr_setscope;
pthread_mutex_init; pthread_mutex_destroy;
pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;
@@ -56,8 +56,6 @@ name decl \
FORWARD2 (name, int, decl, params, return defretval)
-FORWARD (pthread_attr_getscope,
- (const pthread_attr_t *attr, int *scope), (attr, scope), 0)
FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
(attr, scope), 0)
@@ -72,7 +72,6 @@ void __nptl_set_robust (struct pthread *);
#ifdef SHARED
static const struct pthread_functions pthread_functions =
{
- .ptr_pthread_attr_getscope = __pthread_attr_getscope,
.ptr_pthread_attr_setscope = __pthread_attr_setscope,
.ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
.ptr_pthread_condattr_init = __pthread_condattr_init,
@@ -30,7 +30,6 @@ struct xid_command;
the thread functions. */
struct pthread_functions
{
- int (*ptr_pthread_attr_getscope) (const pthread_attr_t *, int *);
int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);
int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
@@ -69,7 +69,6 @@ GLIBC_2.17 pread F
GLIBC_2.17 pread64 F
GLIBC_2.17 pthread_attr_getaffinity_np F
GLIBC_2.17 pthread_attr_getguardsize F
-GLIBC_2.17 pthread_attr_getscope F
GLIBC_2.17 pthread_attr_getstack F
GLIBC_2.17 pthread_attr_getstackaddr F
GLIBC_2.17 pthread_attr_getstacksize F
@@ -44,7 +44,6 @@ GLIBC_2.0 msync F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getscope F
GLIBC_2.0 pthread_attr_setscope F
GLIBC_2.0 pthread_cancel F
GLIBC_2.0 pthread_cond_broadcast F
@@ -104,7 +104,6 @@ GLIBC_2.4 pread F
GLIBC_2.4 pread64 F
GLIBC_2.4 pthread_attr_getaffinity_np F
GLIBC_2.4 pthread_attr_getguardsize F
-GLIBC_2.4 pthread_attr_getscope F
GLIBC_2.4 pthread_attr_getstack F
GLIBC_2.4 pthread_attr_getstackaddr F
GLIBC_2.4 pthread_attr_getstacksize F
@@ -104,7 +104,6 @@ GLIBC_2.4 pread F
GLIBC_2.4 pread64 F
GLIBC_2.4 pthread_attr_getaffinity_np F
GLIBC_2.4 pthread_attr_getguardsize F
-GLIBC_2.4 pthread_attr_getscope F
GLIBC_2.4 pthread_attr_getstack F
GLIBC_2.4 pthread_attr_getstackaddr F
GLIBC_2.4 pthread_attr_getstacksize F
@@ -77,7 +77,6 @@ GLIBC_2.29 pread F
GLIBC_2.29 pread64 F
GLIBC_2.29 pthread_attr_getaffinity_np F
GLIBC_2.29 pthread_attr_getguardsize F
-GLIBC_2.29 pthread_attr_getscope F
GLIBC_2.29 pthread_attr_getstack F
GLIBC_2.29 pthread_attr_getstackaddr F
GLIBC_2.29 pthread_attr_getstacksize F
@@ -71,7 +71,6 @@ GLIBC_2.2 pread F
GLIBC_2.2 pread64 F
GLIBC_2.2 pthread_atfork F
GLIBC_2.2 pthread_attr_getguardsize F
-GLIBC_2.2 pthread_attr_getscope F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_getstackaddr F
GLIBC_2.2 pthread_attr_getstacksize F
@@ -44,7 +44,6 @@ GLIBC_2.0 msync F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getscope F
GLIBC_2.0 pthread_attr_setscope F
GLIBC_2.0 pthread_cancel F
GLIBC_2.0 pthread_cond_broadcast F
@@ -71,7 +71,6 @@ GLIBC_2.2 pread F
GLIBC_2.2 pread64 F
GLIBC_2.2 pthread_atfork F
GLIBC_2.2 pthread_attr_getguardsize F
-GLIBC_2.2 pthread_attr_getscope F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_getstackaddr F
GLIBC_2.2 pthread_attr_getstacksize F
@@ -104,7 +104,6 @@ GLIBC_2.4 pread F
GLIBC_2.4 pread64 F
GLIBC_2.4 pthread_attr_getaffinity_np F
GLIBC_2.4 pthread_attr_getguardsize F
-GLIBC_2.4 pthread_attr_getscope F
GLIBC_2.4 pthread_attr_getstack F
GLIBC_2.4 pthread_attr_getstackaddr F
GLIBC_2.4 pthread_attr_getstacksize F
@@ -44,7 +44,6 @@ GLIBC_2.0 msync F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getscope F
GLIBC_2.0 pthread_attr_setscope F
GLIBC_2.0 pthread_cancel F
GLIBC_2.0 pthread_cond_broadcast F
@@ -69,7 +69,6 @@ GLIBC_2.18 pread F
GLIBC_2.18 pread64 F
GLIBC_2.18 pthread_attr_getaffinity_np F
GLIBC_2.18 pthread_attr_getguardsize F
-GLIBC_2.18 pthread_attr_getscope F
GLIBC_2.18 pthread_attr_getstack F
GLIBC_2.18 pthread_attr_getstackaddr F
GLIBC_2.18 pthread_attr_getstacksize F
@@ -69,7 +69,6 @@ GLIBC_2.18 pread F
GLIBC_2.18 pread64 F
GLIBC_2.18 pthread_attr_getaffinity_np F
GLIBC_2.18 pthread_attr_getguardsize F
-GLIBC_2.18 pthread_attr_getscope F
GLIBC_2.18 pthread_attr_getstack F
GLIBC_2.18 pthread_attr_getstackaddr F
GLIBC_2.18 pthread_attr_getstacksize F
@@ -44,7 +44,6 @@ GLIBC_2.0 msync F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getscope F
GLIBC_2.0 pthread_attr_setscope F
GLIBC_2.0 pthread_cancel F
GLIBC_2.0 pthread_cond_broadcast F
@@ -44,7 +44,6 @@ GLIBC_2.0 msync F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getscope F
GLIBC_2.0 pthread_attr_setscope F
GLIBC_2.0 pthread_cancel F
GLIBC_2.0 pthread_cond_broadcast F
@@ -69,7 +69,6 @@ GLIBC_2.21 pread F
GLIBC_2.21 pread64 F
GLIBC_2.21 pthread_attr_getaffinity_np F
GLIBC_2.21 pthread_attr_getguardsize F
-GLIBC_2.21 pthread_attr_getscope F
GLIBC_2.21 pthread_attr_getstack F
GLIBC_2.21 pthread_attr_getstackaddr F
GLIBC_2.21 pthread_attr_getstacksize F
@@ -44,7 +44,6 @@ GLIBC_2.0 msync F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getscope F
GLIBC_2.0 pthread_attr_setscope F
GLIBC_2.0 pthread_cancel F
GLIBC_2.0 pthread_cond_broadcast F
@@ -91,7 +91,6 @@ GLIBC_2.3 pause F
GLIBC_2.3 pread F
GLIBC_2.3 pread64 F
GLIBC_2.3 pthread_attr_getguardsize F
-GLIBC_2.3 pthread_attr_getscope F
GLIBC_2.3 pthread_attr_getstack F
GLIBC_2.3 pthread_attr_getstackaddr F
GLIBC_2.3 pthread_attr_getstacksize F
@@ -69,7 +69,6 @@ GLIBC_2.17 pread F
GLIBC_2.17 pread64 F
GLIBC_2.17 pthread_attr_getaffinity_np F
GLIBC_2.17 pthread_attr_getguardsize F
-GLIBC_2.17 pthread_attr_getscope F
GLIBC_2.17 pthread_attr_getstack F
GLIBC_2.17 pthread_attr_getstackaddr F
GLIBC_2.17 pthread_attr_getstacksize F
@@ -66,7 +66,6 @@ GLIBC_2.27 pread F
GLIBC_2.27 pread64 F
GLIBC_2.27 pthread_attr_getaffinity_np F
GLIBC_2.27 pthread_attr_getguardsize F
-GLIBC_2.27 pthread_attr_getscope F
GLIBC_2.27 pthread_attr_getstack F
GLIBC_2.27 pthread_attr_getstackaddr F
GLIBC_2.27 pthread_attr_getstacksize F
@@ -44,7 +44,6 @@ GLIBC_2.0 msync F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getscope F
GLIBC_2.0 pthread_attr_setscope F
GLIBC_2.0 pthread_cancel F
GLIBC_2.0 pthread_cond_broadcast F
@@ -73,7 +73,6 @@ GLIBC_2.2 pread F
GLIBC_2.2 pread64 F
GLIBC_2.2 pthread_atfork F
GLIBC_2.2 pthread_attr_getguardsize F
-GLIBC_2.2 pthread_attr_getscope F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_getstackaddr F
GLIBC_2.2 pthread_attr_getstacksize F
@@ -71,7 +71,6 @@ GLIBC_2.2 pread F
GLIBC_2.2 pread64 F
GLIBC_2.2 pthread_atfork F
GLIBC_2.2 pthread_attr_getguardsize F
-GLIBC_2.2 pthread_attr_getscope F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_getstackaddr F
GLIBC_2.2 pthread_attr_getstacksize F
@@ -71,7 +71,6 @@ GLIBC_2.2 pread F
GLIBC_2.2 pread64 F
GLIBC_2.2 pthread_atfork F
GLIBC_2.2 pthread_attr_getguardsize F
-GLIBC_2.2 pthread_attr_getscope F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_getstackaddr F
GLIBC_2.2 pthread_attr_getstacksize F
@@ -44,7 +44,6 @@ GLIBC_2.0 msync F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getscope F
GLIBC_2.0 pthread_attr_setscope F
GLIBC_2.0 pthread_cancel F
GLIBC_2.0 pthread_cond_broadcast F
@@ -71,7 +71,6 @@ GLIBC_2.2 pread F
GLIBC_2.2 pread64 F
GLIBC_2.2 pthread_atfork F
GLIBC_2.2 pthread_attr_getguardsize F
-GLIBC_2.2 pthread_attr_getscope F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_getstackaddr F
GLIBC_2.2 pthread_attr_getstacksize F
@@ -71,7 +71,6 @@ GLIBC_2.2.5 pread F
GLIBC_2.2.5 pread64 F
GLIBC_2.2.5 pthread_atfork F
GLIBC_2.2.5 pthread_attr_getguardsize F
-GLIBC_2.2.5 pthread_attr_getscope F
GLIBC_2.2.5 pthread_attr_getstack F
GLIBC_2.2.5 pthread_attr_getstackaddr F
GLIBC_2.2.5 pthread_attr_getstacksize F
@@ -69,7 +69,6 @@ GLIBC_2.16 pread F
GLIBC_2.16 pread64 F
GLIBC_2.16 pthread_attr_getaffinity_np F
GLIBC_2.16 pthread_attr_getguardsize F
-GLIBC_2.16 pthread_attr_getscope F
GLIBC_2.16 pthread_attr_getstack F
GLIBC_2.16 pthread_attr_getstackaddr F
GLIBC_2.16 pthread_attr_getstacksize F