nptl: Move pthread_attr_getinheritsched implementation into libc
Commit Message
2019-08-28 Florian Weimer <fweimer@redhat.com>
nptl: Move pthread_attr_getinheritsched implementation into libc.
* nptl/Makefile (routines): Add pthread_attr_getinheritsched.
(libpthread-routines): Remove pthread_attr_getinheritsched.
* nptl/Versions (libpthread GLIBC_2.0): Remove
pthread_attr_getinheritsched.
* nptl/forward.c (pthread_attr_getinheritsched): Remove definition.
* nptl/nptl-init.c (pthread_functions): Remove initializer for
ptr_pthread_attr_getinheritsched.
* sysdeps/nptl/pthread-functions.h (struct pthread_functions):
Remove ptr_pthread_attr_getinheritsched member.
* sysdeps/unix/sysv/linux/aarch64/libpthread.abilist (GLIBC_2.17):
Remove pthread_attr_getinheritsched.
* sysdeps/unix/sysv/linux/alpha/libpthread.abilist (GLIBC_2.0):
Likewise.
* sysdeps/unix/sysv/linux/arm/libpthread.abilist (GLIBC_2.4):
Likewise.
* sysdeps/unix/sysv/linux/csky/libpthread.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/hppa/libpthread.abilist (GLIBC_2.2):
Likewise.
* sysdeps/unix/sysv/linux/i386/libpthread.abilist (GLIBC_2.0):
Likewise.
* sysdeps/unix/sysv/linux/ia64/libpthread.abilist (GLIBC_2.2):
Likewise.
* sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
(GLIBC_2.4): Likewise.
* sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
(GLIBC_2.0): Likewise.
* sysdeps/unix/sysv/linux/microblaze/libpthread.abilist
(GLIBC_2.18): Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
(GLIBC_2.0): Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
(GLIBC_2.0): Likewise.
* sysdeps/unix/sysv/linux/nios2/libpthread.abilist (GLIBC_2.21):
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
(GLIBC_2.0): Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
(GLIBC_2.3): Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
(GLIBC_2.17): Likewise.
* sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
(GLIBC_2.27): Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
(GLIBC_2.0): Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
(GLIBC_2.2): Likewise.
* sysdeps/unix/sysv/linux/sh/libpthread.abilist (GLIBC_2.2):
Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
(GLIBC_2.0): Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
(GLIBC_2.2): Likewise.
* sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
(GLIBC_2.2.5): Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
(GLIBC_2.16): Likewise.
Comments
On 28/08/2019 18:43, Florian Weimer wrote:
> 2019-08-28 Florian Weimer <fweimer@redhat.com>
>
> nptl: Move pthread_attr_getinheritsched implementation into libc.
> * nptl/Makefile (routines): Add pthread_attr_getinheritsched.
> (libpthread-routines): Remove pthread_attr_getinheritsched.
> * nptl/Versions (libpthread GLIBC_2.0): Remove
> pthread_attr_getinheritsched.
> * nptl/forward.c (pthread_attr_getinheritsched): Remove definition.
> * nptl/nptl-init.c (pthread_functions): Remove initializer for
> ptr_pthread_attr_getinheritsched.
> * sysdeps/nptl/pthread-functions.h (struct pthread_functions):
> Remove ptr_pthread_attr_getinheritsched member.
> * sysdeps/unix/sysv/linux/aarch64/libpthread.abilist (GLIBC_2.17):
> Remove pthread_attr_getinheritsched.
> * sysdeps/unix/sysv/linux/alpha/libpthread.abilist (GLIBC_2.0):
> Likewise.
> * sysdeps/unix/sysv/linux/arm/libpthread.abilist (GLIBC_2.4):
> Likewise.
> * sysdeps/unix/sysv/linux/csky/libpthread.abilist (GLIBC_2.29):
> Likewise.
> * sysdeps/unix/sysv/linux/hppa/libpthread.abilist (GLIBC_2.2):
> Likewise.
> * sysdeps/unix/sysv/linux/i386/libpthread.abilist (GLIBC_2.0):
> Likewise.
> * sysdeps/unix/sysv/linux/ia64/libpthread.abilist (GLIBC_2.2):
> Likewise.
> * sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> (GLIBC_2.4): Likewise.
> * sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> (GLIBC_2.0): Likewise.
> * sysdeps/unix/sysv/linux/microblaze/libpthread.abilist
> (GLIBC_2.18): Likewise.
> * sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> (GLIBC_2.0): Likewise.
> * sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> (GLIBC_2.0): Likewise.
> * sysdeps/unix/sysv/linux/nios2/libpthread.abilist (GLIBC_2.21):
> Likewise.
> * sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> (GLIBC_2.0): Likewise.
> * sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> (GLIBC_2.3): Likewise.
> * sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> (GLIBC_2.17): Likewise.
> * sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> (GLIBC_2.27): Likewise.
> * sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> (GLIBC_2.0): Likewise.
> * sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> (GLIBC_2.2): Likewise.
> * sysdeps/unix/sysv/linux/sh/libpthread.abilist (GLIBC_2.2):
> Likewise.
> * sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> (GLIBC_2.0): Likewise.
> * sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> (GLIBC_2.2): Likewise.
> * sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> (GLIBC_2.2.5): Likewise.
> * sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> (GLIBC_2.16): Likewise.
LGTM, but you will need to update the abilist files to take in consideration
the changes I did for sh, microblaze, and arm.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
>
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 823241d3a0..47ec88b5cf 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -32,7 +32,7 @@ routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
> register-atfork pthread_atfork pthread_self thrd_current \
> thrd_equal thrd_sleep thrd_yield pthread_equal \
> pthread_attr_destroy pthread_attr_init pthread_attr_getdetachstate \
> - pthread_attr_setdetachstate
> + pthread_attr_setdetachstate pthread_attr_getinheritsched
> shared-only-routines = forward
> static-only-routines = pthread_atfork
>
Ok.
> @@ -58,7 +58,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
> pthread_attr_getguardsize pthread_attr_setguardsize \
> pthread_attr_getschedparam pthread_attr_setschedparam \
> pthread_attr_getschedpolicy pthread_attr_setschedpolicy \
> - pthread_attr_getinheritsched \
> pthread_attr_setinheritsched \
> pthread_attr_getscope pthread_attr_setscope \
> pthread_attr_getstackaddr pthread_attr_setstackaddr \
Ok.
> diff --git a/nptl/Versions b/nptl/Versions
> index 1e055eaabe..6f4d74ffda 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -51,7 +51,7 @@ libpthread {
>
> pthread_attr_getschedparam; pthread_attr_setschedparam;
> pthread_attr_getschedpolicy; pthread_attr_setschedpolicy;
> - pthread_attr_getinheritsched; pthread_attr_setinheritsched;
> + pthread_attr_setinheritsched;
> pthread_attr_getscope; pthread_attr_setscope;
>
> pthread_mutex_init; pthread_mutex_destroy;
Ok.
> diff --git a/nptl/forward.c b/nptl/forward.c
> index 163a3e5d5b..95e477ff37 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_getinheritsched,
> - (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0)
> FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit),
> (attr, inherit), 0)
>
Ok.
> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 4594cf53ea..80fa46fb5c 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_getinheritsched = __pthread_attr_getinheritsched,
> .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched,
> .ptr_pthread_attr_getschedparam = __pthread_attr_getschedparam,
> .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
Ok.
> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 36ef2bd674..3d1101a2b0 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_getinheritsched) (const pthread_attr_t *, int *);
> int (*ptr_pthread_attr_setinheritsched) (pthread_attr_t *, int);
> int (*ptr_pthread_attr_getschedparam) (const pthread_attr_t *,
> struct sched_param *);
Ok.
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index cf254a41f1..cdc3ad5f34 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -72,7 +72,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_getinheritsched F
> GLIBC_2.17 pthread_attr_getschedparam F
> GLIBC_2.17 pthread_attr_getschedpolicy F
> GLIBC_2.17 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 5a64d6ff96..e2c883272a 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getinheritsched F
> GLIBC_2.0 pthread_attr_getschedparam F
> GLIBC_2.0 pthread_attr_getschedpolicy F
> GLIBC_2.0 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/arm/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/libpthread.abilist
> index 2baa87ea07..db670efe7b 100644
> --- a/sysdeps/unix/sysv/linux/arm/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/libpthread.abilist
> @@ -106,7 +106,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_getinheritsched F
> GLIBC_2.4 pthread_attr_getschedparam F
> GLIBC_2.4 pthread_attr_getschedpolicy F
> GLIBC_2.4 pthread_attr_getscope F
This will need an update to take in consideration 1673ba87fe.
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 3b508053c2..44eedc7647 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -80,7 +80,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_getinheritsched F
> GLIBC_2.29 pthread_attr_getschedparam F
> GLIBC_2.29 pthread_attr_getschedpolicy F
> GLIBC_2.29 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index 34398ad320..545476131b 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/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_getinheritsched F
> GLIBC_2.2 pthread_attr_getschedparam F
> GLIBC_2.2 pthread_attr_getschedpolicy F
> GLIBC_2.2 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index 4f1cd69999..f9e7821410 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getinheritsched F
> GLIBC_2.0 pthread_attr_getschedparam F
> GLIBC_2.0 pthread_attr_getschedpolicy F
> GLIBC_2.0 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index ba43587275..5be0e0f7b4 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/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_getinheritsched F
> GLIBC_2.2 pthread_attr_getschedparam F
> GLIBC_2.2 pthread_attr_getschedpolicy F
> GLIBC_2.2 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 2baa87ea07..db670efe7b 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -106,7 +106,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_getinheritsched F
> GLIBC_2.4 pthread_attr_getschedparam F
> GLIBC_2.4 pthread_attr_getschedpolicy F
> GLIBC_2.4 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index 4f1cd69999..f9e7821410 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getinheritsched F
> GLIBC_2.0 pthread_attr_getschedparam F
> GLIBC_2.0 pthread_attr_getschedpolicy F
> GLIBC_2.0 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist
> index 5a182c10b2..7bee5b4e87 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist
> @@ -72,7 +72,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_getinheritsched F
> GLIBC_2.18 pthread_attr_getschedparam F
> GLIBC_2.18 pthread_attr_getschedpolicy F
> GLIBC_2.18 pthread_attr_getscope F
This will need an update to take in consideration c7fca8d404.
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 3c0748a7a4..e0390a6bcb 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getinheritsched F
> GLIBC_2.0 pthread_attr_getschedparam F
> GLIBC_2.0 pthread_attr_getschedpolicy F
> GLIBC_2.0 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 3c0748a7a4..e0390a6bcb 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getinheritsched F
> GLIBC_2.0 pthread_attr_getschedparam F
> GLIBC_2.0 pthread_attr_getschedpolicy F
> GLIBC_2.0 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index f9e7962dfb..21abc950c8 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -72,7 +72,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_getinheritsched F
> GLIBC_2.21 pthread_attr_getschedparam F
> GLIBC_2.21 pthread_attr_getschedpolicy F
> GLIBC_2.21 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 63e3af6d93..c410fa893a 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getinheritsched F
> GLIBC_2.0 pthread_attr_getschedparam F
> GLIBC_2.0 pthread_attr_getschedpolicy F
> GLIBC_2.0 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index c6345841e7..a0a805888e 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -94,7 +94,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_getinheritsched F
> GLIBC_2.3 pthread_attr_getschedparam F
> GLIBC_2.3 pthread_attr_getschedpolicy F
> GLIBC_2.3 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index cf254a41f1..cdc3ad5f34 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -72,7 +72,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_getinheritsched F
> GLIBC_2.17 pthread_attr_getschedparam F
> GLIBC_2.17 pthread_attr_getschedpolicy F
> GLIBC_2.17 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index b115a750d7..aa6f7936e2 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -69,7 +69,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_getinheritsched F
> GLIBC_2.27 pthread_attr_getschedparam F
> GLIBC_2.27 pthread_attr_getschedpolicy F
> GLIBC_2.27 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index 4010e27452..c504fbfacc 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getinheritsched F
> GLIBC_2.0 pthread_attr_getschedparam F
> GLIBC_2.0 pthread_attr_getschedpolicy F
> GLIBC_2.0 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 6c7474b63e..933f20299c 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -75,7 +75,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_getinheritsched F
> GLIBC_2.2 pthread_attr_getschedparam F
> GLIBC_2.2 pthread_attr_getschedpolicy F
> GLIBC_2.2 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/sh/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/libpthread.abilist
> index 34398ad320..545476131b 100644
> --- a/sysdeps/unix/sysv/linux/sh/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/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_getinheritsched F
> GLIBC_2.2 pthread_attr_getschedparam F
> GLIBC_2.2 pthread_attr_getschedpolicy F
> GLIBC_2.2 pthread_attr_getscope F
This will need an update to take in consideration 605f38177d.
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 5a64d6ff96..e2c883272a 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
> GLIBC_2.0 open F
> GLIBC_2.0 pause F
> GLIBC_2.0 pthread_atfork F
> -GLIBC_2.0 pthread_attr_getinheritsched F
> GLIBC_2.0 pthread_attr_getschedparam F
> GLIBC_2.0 pthread_attr_getschedpolicy F
> GLIBC_2.0 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index ba43587275..5be0e0f7b4 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/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_getinheritsched F
> GLIBC_2.2 pthread_attr_getschedparam F
> GLIBC_2.2 pthread_attr_getschedpolicy F
> GLIBC_2.2 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index e366c397e1..87be582075 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -73,7 +73,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_getinheritsched F
> GLIBC_2.2.5 pthread_attr_getschedparam F
> GLIBC_2.2.5 pthread_attr_getschedpolicy F
> GLIBC_2.2.5 pthread_attr_getscope F
Ok.
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 1692ddd839..5539c4e66d 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -72,7 +72,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_getinheritsched F
> GLIBC_2.16 pthread_attr_getschedparam F
> GLIBC_2.16 pthread_attr_getschedpolicy F
> GLIBC_2.16 pthread_attr_getscope F
>
Ok.
@@ -32,7 +32,7 @@ routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
register-atfork pthread_atfork pthread_self thrd_current \
thrd_equal thrd_sleep thrd_yield pthread_equal \
pthread_attr_destroy pthread_attr_init pthread_attr_getdetachstate \
- pthread_attr_setdetachstate
+ pthread_attr_setdetachstate pthread_attr_getinheritsched
shared-only-routines = forward
static-only-routines = pthread_atfork
@@ -58,7 +58,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
pthread_attr_getguardsize pthread_attr_setguardsize \
pthread_attr_getschedparam pthread_attr_setschedparam \
pthread_attr_getschedpolicy pthread_attr_setschedpolicy \
- pthread_attr_getinheritsched \
pthread_attr_setinheritsched \
pthread_attr_getscope pthread_attr_setscope \
pthread_attr_getstackaddr pthread_attr_setstackaddr \
@@ -51,7 +51,7 @@ libpthread {
pthread_attr_getschedparam; pthread_attr_setschedparam;
pthread_attr_getschedpolicy; pthread_attr_setschedpolicy;
- pthread_attr_getinheritsched; pthread_attr_setinheritsched;
+ pthread_attr_setinheritsched;
pthread_attr_getscope; pthread_attr_setscope;
pthread_mutex_init; pthread_mutex_destroy;
@@ -56,8 +56,6 @@ name decl \
FORWARD2 (name, int, decl, params, return defretval)
-FORWARD (pthread_attr_getinheritsched,
- (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0)
FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit),
(attr, inherit), 0)
@@ -72,7 +72,6 @@ void __nptl_set_robust (struct pthread *);
#ifdef SHARED
static const struct pthread_functions pthread_functions =
{
- .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched,
.ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched,
.ptr_pthread_attr_getschedparam = __pthread_attr_getschedparam,
.ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
@@ -30,7 +30,6 @@ struct xid_command;
the thread functions. */
struct pthread_functions
{
- int (*ptr_pthread_attr_getinheritsched) (const pthread_attr_t *, int *);
int (*ptr_pthread_attr_setinheritsched) (pthread_attr_t *, int);
int (*ptr_pthread_attr_getschedparam) (const pthread_attr_t *,
struct sched_param *);
@@ -72,7 +72,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_getinheritsched F
GLIBC_2.17 pthread_attr_getschedparam F
GLIBC_2.17 pthread_attr_getschedpolicy F
GLIBC_2.17 pthread_attr_getscope F
@@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getinheritsched F
GLIBC_2.0 pthread_attr_getschedparam F
GLIBC_2.0 pthread_attr_getschedpolicy F
GLIBC_2.0 pthread_attr_getscope F
@@ -106,7 +106,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_getinheritsched F
GLIBC_2.4 pthread_attr_getschedparam F
GLIBC_2.4 pthread_attr_getschedpolicy F
GLIBC_2.4 pthread_attr_getscope F
@@ -80,7 +80,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_getinheritsched F
GLIBC_2.29 pthread_attr_getschedparam F
GLIBC_2.29 pthread_attr_getschedpolicy F
GLIBC_2.29 pthread_attr_getscope 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_getinheritsched F
GLIBC_2.2 pthread_attr_getschedparam F
GLIBC_2.2 pthread_attr_getschedpolicy F
GLIBC_2.2 pthread_attr_getscope F
@@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getinheritsched F
GLIBC_2.0 pthread_attr_getschedparam F
GLIBC_2.0 pthread_attr_getschedpolicy F
GLIBC_2.0 pthread_attr_getscope 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_getinheritsched F
GLIBC_2.2 pthread_attr_getschedparam F
GLIBC_2.2 pthread_attr_getschedpolicy F
GLIBC_2.2 pthread_attr_getscope F
@@ -106,7 +106,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_getinheritsched F
GLIBC_2.4 pthread_attr_getschedparam F
GLIBC_2.4 pthread_attr_getschedpolicy F
GLIBC_2.4 pthread_attr_getscope F
@@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getinheritsched F
GLIBC_2.0 pthread_attr_getschedparam F
GLIBC_2.0 pthread_attr_getschedpolicy F
GLIBC_2.0 pthread_attr_getscope F
@@ -72,7 +72,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_getinheritsched F
GLIBC_2.18 pthread_attr_getschedparam F
GLIBC_2.18 pthread_attr_getschedpolicy F
GLIBC_2.18 pthread_attr_getscope F
@@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getinheritsched F
GLIBC_2.0 pthread_attr_getschedparam F
GLIBC_2.0 pthread_attr_getschedpolicy F
GLIBC_2.0 pthread_attr_getscope F
@@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getinheritsched F
GLIBC_2.0 pthread_attr_getschedparam F
GLIBC_2.0 pthread_attr_getschedpolicy F
GLIBC_2.0 pthread_attr_getscope F
@@ -72,7 +72,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_getinheritsched F
GLIBC_2.21 pthread_attr_getschedparam F
GLIBC_2.21 pthread_attr_getschedpolicy F
GLIBC_2.21 pthread_attr_getscope F
@@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getinheritsched F
GLIBC_2.0 pthread_attr_getschedparam F
GLIBC_2.0 pthread_attr_getschedpolicy F
GLIBC_2.0 pthread_attr_getscope F
@@ -94,7 +94,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_getinheritsched F
GLIBC_2.3 pthread_attr_getschedparam F
GLIBC_2.3 pthread_attr_getschedpolicy F
GLIBC_2.3 pthread_attr_getscope F
@@ -72,7 +72,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_getinheritsched F
GLIBC_2.17 pthread_attr_getschedparam F
GLIBC_2.17 pthread_attr_getschedpolicy F
GLIBC_2.17 pthread_attr_getscope F
@@ -69,7 +69,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_getinheritsched F
GLIBC_2.27 pthread_attr_getschedparam F
GLIBC_2.27 pthread_attr_getschedpolicy F
GLIBC_2.27 pthread_attr_getscope F
@@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getinheritsched F
GLIBC_2.0 pthread_attr_getschedparam F
GLIBC_2.0 pthread_attr_getschedpolicy F
GLIBC_2.0 pthread_attr_getscope F
@@ -75,7 +75,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_getinheritsched F
GLIBC_2.2 pthread_attr_getschedparam F
GLIBC_2.2 pthread_attr_getschedpolicy F
GLIBC_2.2 pthread_attr_getscope 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_getinheritsched F
GLIBC_2.2 pthread_attr_getschedparam F
GLIBC_2.2 pthread_attr_getschedpolicy F
GLIBC_2.2 pthread_attr_getscope F
@@ -46,7 +46,6 @@ GLIBC_2.0 nanosleep F
GLIBC_2.0 open F
GLIBC_2.0 pause F
GLIBC_2.0 pthread_atfork F
-GLIBC_2.0 pthread_attr_getinheritsched F
GLIBC_2.0 pthread_attr_getschedparam F
GLIBC_2.0 pthread_attr_getschedpolicy F
GLIBC_2.0 pthread_attr_getscope 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_getinheritsched F
GLIBC_2.2 pthread_attr_getschedparam F
GLIBC_2.2 pthread_attr_getschedpolicy F
GLIBC_2.2 pthread_attr_getscope F
@@ -73,7 +73,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_getinheritsched F
GLIBC_2.2.5 pthread_attr_getschedparam F
GLIBC_2.2.5 pthread_attr_getschedpolicy F
GLIBC_2.2.5 pthread_attr_getscope F
@@ -72,7 +72,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_getinheritsched F
GLIBC_2.16 pthread_attr_getschedparam F
GLIBC_2.16 pthread_attr_getschedpolicy F
GLIBC_2.16 pthread_attr_getscope F