nptl: Move pthread_attr_getscope implementation into libc
authorFlorian Weimer <fweimer@redhat.com>
Mon, 10 Feb 2020 10:26:00 +0000 (11:26 +0100)
committerFlorian Weimer <fweimer@redhat.com>
Thu, 20 Feb 2020 07:57:01 +0000 (08:57 +0100)
This is part of the libpthread removal project:

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

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
32 files changed:
nptl/Makefile
nptl/Versions
nptl/forward.c
nptl/nptl-init.c
sysdeps/nptl/pthread-functions.h
sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
sysdeps/unix/sysv/linux/alpha/libpthread.abilist
sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
sysdeps/unix/sysv/linux/csky/libpthread.abilist
sysdeps/unix/sysv/linux/hppa/libpthread.abilist
sysdeps/unix/sysv/linux/i386/libpthread.abilist
sysdeps/unix/sysv/linux/ia64/libpthread.abilist
sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
sysdeps/unix/sysv/linux/nios2/libpthread.abilist
sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist

index 6a86021..fb954c6 100644 (file)
@@ -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 \
index ca0a7e6..88b4266 100644 (file)
@@ -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;
index 7e7fcf2..43f9eb6 100644 (file)
@@ -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)
 
index 96c2b61..6a56a14 100644 (file)
@@ -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,
index 927ac5a..a38f9d7 100644 (file)
@@ -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 *);
index 2f3fd8b..1c1eefb 100644 (file)
@@ -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
index 782582e..7c97102 100644 (file)
@@ -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
index 3802f5d..1a3cd91 100644 (file)
@@ -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
index 3802f5d..1a3cd91 100644 (file)
@@ -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
index 5a787cd..e201451 100644 (file)
@@ -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
index a3ce51c..a0759eb 100644 (file)
@@ -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
index db97003..dab30e9 100644 (file)
@@ -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
index fce31e5..ccf83eb 100644 (file)
@@ -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
index 3802f5d..1a3cd91 100644 (file)
@@ -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
index db97003..dab30e9 100644 (file)
@@ -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
index 9bcadbe..1859365 100644 (file)
@@ -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
index 9bcadbe..1859365 100644 (file)
@@ -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
index 0f9ed9c..0a4c17b 100644 (file)
@@ -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
index 0f9ed9c..0a4c17b 100644 (file)
@@ -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
index 9427133..edf8c19 100644 (file)
@@ -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
index 8ef7663..2e80e3b 100644 (file)
@@ -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
index c8374e3..6f12c83 100644 (file)
@@ -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
index 2f3fd8b..1c1eefb 100644 (file)
@@ -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
index 21ad813..60a6f89 100644 (file)
@@ -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
index 2535211..d37af9c 100644 (file)
@@ -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
index 820b340..964eb07 100644 (file)
@@ -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
index a3ce51c..a0759eb 100644 (file)
@@ -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
index a3ce51c..a0759eb 100644 (file)
@@ -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
index 782582e..7c97102 100644 (file)
@@ -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
index fce31e5..ccf83eb 100644 (file)
@@ -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
index a5ad630..0a4c6b3 100644 (file)
@@ -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
index 595ca1a..35352d5 100644 (file)
@@ -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