unofficial mirror of libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 00/13] nptl: Move more functions from libpthread to libc
@ 2020-02-11 11:05 Florian Weimer
  2020-02-11 11:06 ` [PATCH 01/13] nptl: Use .NOTPARALLEL in Makefile only if actually running tests Florian Weimer
                   ` (12 more replies)
  0 siblings, 13 replies; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:05 UTC (permalink / raw)
  To: libc-alpha

This series deals with the remaining libpthread functions which do not
require new symbol versions (because they already had forwarders in
libc) nor substantial code changes.

Florian Weimer (13):
  nptl: Use .NOTPARALLEL in Makefile only if actually running tests
  nptl: Sort routines list in Makefile alphabetically
  nptl: Move pthread_attr_getschedpolicy implementation into libc
  nptl: Move pthread_attr_setschedpolicy implementation into libc
  nptl: Move pthread_attr_getscope implementation into libc
  nptl: Move pthread_attr_setscope implementation into libc
  nptl: Move pthread_condattr_destroy implementation into libc
  nptl: Move pthread_condattr_init implementation into libc
  nptl: Move pthread_cond_destroy implementation into libc
  nptl: Move pthread_cond_init implementation into libc
  Add hidden prototypes for __sched_getparam, __sched_getscheduler
  nptl: Move pthread_getschedparam implementation into libc
  nptl: Move pthread_setschedparam implementation into libc

 include/sched.h                               |  2 +
 nptl/Makefile                                 | 50 +++++++++++++------
 nptl/Versions                                 | 12 ++---
 nptl/forward.c                                | 43 ----------------
 nptl/nptl-init.c                              | 12 -----
 nptl/old_pthread_cond_destroy.c               |  4 +-
 nptl/old_pthread_cond_init.c                  |  4 +-
 nptl/pthreadP.h                               |  2 +
 nptl/pthread_cond_destroy.c                   |  3 +-
 nptl/pthread_cond_init.c                      |  3 +-
 posix/sched_getp.c                            |  1 +
 posix/sched_gets.c                            |  1 +
 sysdeps/nptl/pthread-functions.h              | 15 ------
 .../sysv/linux/aarch64/libpthread.abilist     | 10 ----
 .../unix/sysv/linux/alpha/libpthread.abilist  | 12 -----
 .../unix/sysv/linux/arm/be/libpthread.abilist | 10 ----
 .../unix/sysv/linux/arm/le/libpthread.abilist | 10 ----
 .../unix/sysv/linux/csky/libpthread.abilist   | 10 ----
 .../unix/sysv/linux/hppa/libpthread.abilist   | 12 -----
 .../unix/sysv/linux/i386/libpthread.abilist   | 12 -----
 .../unix/sysv/linux/ia64/libpthread.abilist   | 12 -----
 .../linux/m68k/coldfire/libpthread.abilist    | 10 ----
 .../sysv/linux/m68k/m680x0/libpthread.abilist | 12 -----
 .../linux/microblaze/be/libpthread.abilist    | 10 ----
 .../linux/microblaze/le/libpthread.abilist    | 10 ----
 .../sysv/linux/mips/mips32/libpthread.abilist | 12 -----
 .../sysv/linux/mips/mips64/libpthread.abilist | 12 -----
 .../unix/sysv/linux/nios2/libpthread.abilist  | 10 ----
 .../powerpc/powerpc32/libpthread.abilist      | 12 -----
 .../powerpc/powerpc64/be/libpthread.abilist   | 12 -----
 .../powerpc/powerpc64/le/libpthread.abilist   | 10 ----
 .../sysv/linux/riscv/rv64/libpthread.abilist  | 10 ----
 .../linux/s390/s390-32/libpthread.abilist     | 12 -----
 .../linux/s390/s390-64/libpthread.abilist     | 12 -----
 .../unix/sysv/linux/sh/be/libpthread.abilist  | 12 -----
 .../unix/sysv/linux/sh/le/libpthread.abilist  | 12 -----
 .../linux/sparc/sparc32/libpthread.abilist    | 12 -----
 .../linux/sparc/sparc64/libpthread.abilist    | 12 -----
 .../sysv/linux/x86_64/64/libpthread.abilist   | 12 -----
 .../sysv/linux/x86_64/x32/libpthread.abilist  | 10 ----
 40 files changed, 53 insertions(+), 401 deletions(-)

-- 
2.24.1


^ permalink raw reply	[flat|nested] 28+ messages in thread

* [PATCH 01/13] nptl: Use .NOTPARALLEL in Makefile only if actually running tests
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:28   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 02/13] nptl: Sort routines list in Makefile alphabetically Florian Weimer
                   ` (11 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

It is safe to build the tests in parallel.
---
 nptl/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index 6f210d60e3..40f27ea7cd 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -693,7 +693,9 @@ tst-audit-threads-ENV = LD_AUDIT=$(objpfx)tst-audit-threads-mod1.so
 
 CFLAGS-tst-unwind-thread.c += -funwind-tables
 
-# The tests here better do not run in parallel
+# The tests here better do not run in parallel.
+ifeq ($(run-built-tests),yes)
 ifneq ($(filter %tests,$(MAKECMDGOALS)),)
 .NOTPARALLEL:
 endif
+endif
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 02/13] nptl: Sort routines list in Makefile alphabetically
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
  2020-02-11 11:06 ` [PATCH 01/13] nptl: Use .NOTPARALLEL in Makefile only if actually running tests Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:34   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 03/13] nptl: Move pthread_attr_getschedpolicy implementation into libc Florian Weimer
                   ` (10 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

This will make it easier to review changes which move implementations
from libpthread to libc.
---
 nptl/Makefile | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index 40f27ea7cd..cd416f3208 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -28,13 +28,27 @@ headers := pthread.h semaphore.h bits/semaphore.h \
 extra-libs := libpthread
 extra-libs-others := $(extra-libs)
 
-routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
-	   libc-cleanup libc_pthread_init libc_multiple_threads \
-	   register-atfork pthread_atfork pthread_self pthread_equal \
-	   pthread_attr_destroy pthread_attr_init pthread_attr_getdetachstate \
-	   pthread_attr_setdetachstate pthread_attr_getinheritsched \
-	   pthread_attr_setinheritsched pthread_attr_getschedparam \
-	   pthread_attr_setschedparam
+routines = \
+  alloca_cutoff \
+  forward \
+  libc-cancellation \
+  libc-cleanup \
+  libc-lowlevellock \
+  libc_multiple_threads \
+  libc_pthread_init \
+  pthread_atfork \
+  pthread_attr_destroy \
+  pthread_attr_getdetachstate \
+  pthread_attr_getinheritsched \
+  pthread_attr_getschedparam \
+  pthread_attr_init \
+  pthread_attr_setdetachstate \
+  pthread_attr_setinheritsched \
+  pthread_attr_setschedparam \
+  pthread_equal \
+  pthread_self \
+  register-atfork \
+
 shared-only-routines = forward
 static-only-routines = pthread_atfork
 
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 03/13] nptl: Move pthread_attr_getschedpolicy implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
  2020-02-11 11:06 ` [PATCH 01/13] nptl: Use .NOTPARALLEL in Makefile only if actually running tests Florian Weimer
  2020-02-11 11:06 ` [PATCH 02/13] nptl: Sort routines list in Makefile alphabetically Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:38   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 04/13] nptl: Move pthread_attr_setschedpolicy " Florian Weimer
                   ` (9 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

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(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index cd416f3208..0eb9cda2e4 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -41,6 +41,7 @@ routines = \
   pthread_attr_getdetachstate \
   pthread_attr_getinheritsched \
   pthread_attr_getschedparam \
+  pthread_attr_getschedpolicy \
   pthread_attr_init \
   pthread_attr_setdetachstate \
   pthread_attr_setinheritsched \
@@ -72,7 +73,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_getschedpolicy pthread_attr_setschedpolicy \
+		      pthread_attr_setschedpolicy \
 		      pthread_attr_getscope pthread_attr_setscope \
 		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
 		      pthread_attr_getstacksize pthread_attr_setstacksize \
diff --git a/nptl/Versions b/nptl/Versions
index ff6fc06002..d8312e70cc 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -49,7 +49,7 @@ libpthread {
 
     pthread_getschedparam; pthread_setschedparam;
 
-    pthread_attr_getschedpolicy; pthread_attr_setschedpolicy;
+    pthread_attr_setschedpolicy;
     pthread_attr_getscope; pthread_attr_setscope;
 
     pthread_mutex_init; pthread_mutex_destroy;
diff --git a/nptl/forward.c b/nptl/forward.c
index d2352602da..ed5b6c9bb4 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_getschedpolicy,
-	 (const pthread_attr_t *attr, int *policy), (attr, policy), 0)
 FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy),
 	 (attr, policy), 0)
 
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 1877248014..8d45952f8e 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_getschedpolicy = __pthread_attr_getschedpolicy,
     .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy,
     .ptr_pthread_attr_getscope = __pthread_attr_getscope,
     .ptr_pthread_attr_setscope = __pthread_attr_setscope,
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 54f7c22299..84aed530e3 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_getschedpolicy) (const pthread_attr_t *, int *);
   int (*ptr_pthread_attr_setschedpolicy) (pthread_attr_t *, int);
   int (*ptr_pthread_attr_getscope) (const pthread_attr_t *, int *);
   int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 7fb670d91f..d1d7754821 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_getschedpolicy F
 GLIBC_2.17 pthread_attr_getscope F
 GLIBC_2.17 pthread_attr_getstack F
 GLIBC_2.17 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 17d4ef5ce2..5642844e3b 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_getschedpolicy F
 GLIBC_2.0 pthread_attr_getscope F
 GLIBC_2.0 pthread_attr_setschedpolicy F
 GLIBC_2.0 pthread_attr_setscope F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 144ef997fe..ecacce2795 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_getschedpolicy F
 GLIBC_2.4 pthread_attr_getscope F
 GLIBC_2.4 pthread_attr_getstack F
 GLIBC_2.4 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 144ef997fe..ecacce2795 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_getschedpolicy F
 GLIBC_2.4 pthread_attr_getscope F
 GLIBC_2.4 pthread_attr_getstack F
 GLIBC_2.4 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 4edf765af2..0f16a6377b 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_getschedpolicy F
 GLIBC_2.29 pthread_attr_getscope F
 GLIBC_2.29 pthread_attr_getstack F
 GLIBC_2.29 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index cc562f59eb..87201aece7 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_getschedpolicy F
 GLIBC_2.2 pthread_attr_getscope F
 GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index b90aa4bb52..8bc06163fb 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_getschedpolicy F
 GLIBC_2.0 pthread_attr_getscope F
 GLIBC_2.0 pthread_attr_setschedpolicy F
 GLIBC_2.0 pthread_attr_setscope F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 8692ad0780..3e1a27c136 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_getschedpolicy F
 GLIBC_2.2 pthread_attr_getscope F
 GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 144ef997fe..ecacce2795 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_getschedpolicy F
 GLIBC_2.4 pthread_attr_getscope F
 GLIBC_2.4 pthread_attr_getstack F
 GLIBC_2.4 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index b90aa4bb52..8bc06163fb 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_getschedpolicy F
 GLIBC_2.0 pthread_attr_getscope F
 GLIBC_2.0 pthread_attr_setschedpolicy F
 GLIBC_2.0 pthread_attr_setscope F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index 40dbd1e7c7..fa983ba8e4 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_getschedpolicy F
 GLIBC_2.18 pthread_attr_getscope F
 GLIBC_2.18 pthread_attr_getstack F
 GLIBC_2.18 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index 40dbd1e7c7..fa983ba8e4 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_getschedpolicy F
 GLIBC_2.18 pthread_attr_getscope F
 GLIBC_2.18 pthread_attr_getstack F
 GLIBC_2.18 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 885e880ddd..75cfef4e76 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_getschedpolicy F
 GLIBC_2.0 pthread_attr_getscope F
 GLIBC_2.0 pthread_attr_setschedpolicy F
 GLIBC_2.0 pthread_attr_setscope F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 885e880ddd..75cfef4e76 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_getschedpolicy F
 GLIBC_2.0 pthread_attr_getscope F
 GLIBC_2.0 pthread_attr_setschedpolicy F
 GLIBC_2.0 pthread_attr_setscope F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index e787d881b5..4f2274f567 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_getschedpolicy F
 GLIBC_2.21 pthread_attr_getscope F
 GLIBC_2.21 pthread_attr_getstack F
 GLIBC_2.21 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 4562654f57..e26440b447 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_getschedpolicy F
 GLIBC_2.0 pthread_attr_getscope F
 GLIBC_2.0 pthread_attr_setschedpolicy F
 GLIBC_2.0 pthread_attr_setscope F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index f6ae27d76b..a2d98b1cc4 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_getschedpolicy F
 GLIBC_2.3 pthread_attr_getscope F
 GLIBC_2.3 pthread_attr_getstack F
 GLIBC_2.3 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index 7fb670d91f..d1d7754821 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_getschedpolicy F
 GLIBC_2.17 pthread_attr_getscope F
 GLIBC_2.17 pthread_attr_getstack F
 GLIBC_2.17 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 1581991fd5..58e845dc0f 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_getschedpolicy F
 GLIBC_2.27 pthread_attr_getscope F
 GLIBC_2.27 pthread_attr_getstack F
 GLIBC_2.27 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index 2d1d9e7758..defd68fee7 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_getschedpolicy F
 GLIBC_2.0 pthread_attr_getscope F
 GLIBC_2.0 pthread_attr_setschedpolicy F
 GLIBC_2.0 pthread_attr_setscope F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 575522bfe6..214241aefd 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_getschedpolicy F
 GLIBC_2.2 pthread_attr_getscope F
 GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index cc562f59eb..87201aece7 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_getschedpolicy F
 GLIBC_2.2 pthread_attr_getscope F
 GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index cc562f59eb..87201aece7 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_getschedpolicy F
 GLIBC_2.2 pthread_attr_getscope F
 GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 17d4ef5ce2..5642844e3b 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_getschedpolicy F
 GLIBC_2.0 pthread_attr_getscope F
 GLIBC_2.0 pthread_attr_setschedpolicy F
 GLIBC_2.0 pthread_attr_setscope F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 8692ad0780..3e1a27c136 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_getschedpolicy F
 GLIBC_2.2 pthread_attr_getscope F
 GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 91d0b8b14f..214eaaa15a 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_getschedpolicy 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
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 6d8045dbe0..733a412700 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_getschedpolicy F
 GLIBC_2.16 pthread_attr_getscope F
 GLIBC_2.16 pthread_attr_getstack F
 GLIBC_2.16 pthread_attr_getstackaddr F
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 04/13] nptl: Move pthread_attr_setschedpolicy implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (2 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 03/13] nptl: Move pthread_attr_getschedpolicy implementation into libc Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:39   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 05/13] nptl: Move pthread_attr_getscope " Florian Weimer
                   ` (8 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

This is part of the libpthread removal project:

  <https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>
---
 nptl/Makefile                                                  | 2 +-
 nptl/Versions                                                  | 1 -
 nptl/forward.c                                                 | 3 ---
 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, 1 insertion(+), 34 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index 0eb9cda2e4..1964935fa0 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -46,6 +46,7 @@ routines = \
   pthread_attr_setdetachstate \
   pthread_attr_setinheritsched \
   pthread_attr_setschedparam \
+  pthread_attr_setschedpolicy \
   pthread_equal \
   pthread_self \
   register-atfork \
@@ -73,7 +74,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_getschedparam pthread_setschedparam \
 		      pthread_setschedprio \
 		      pthread_attr_getguardsize pthread_attr_setguardsize \
-		      pthread_attr_setschedpolicy \
 		      pthread_attr_getscope pthread_attr_setscope \
 		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
 		      pthread_attr_getstacksize pthread_attr_setstacksize \
diff --git a/nptl/Versions b/nptl/Versions
index d8312e70cc..ca0a7e62a8 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -49,7 +49,6 @@ libpthread {
 
     pthread_getschedparam; pthread_setschedparam;
 
-    pthread_attr_setschedpolicy;
     pthread_attr_getscope; pthread_attr_setscope;
 
     pthread_mutex_init; pthread_mutex_destroy;
diff --git a/nptl/forward.c b/nptl/forward.c
index ed5b6c9bb4..7e7fcf2c59 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -56,9 +56,6 @@ name decl								      \
   FORWARD2 (name, int, decl, params, return defretval)
 
 
-FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy),
-	 (attr, policy), 0)
-
 FORWARD (pthread_attr_getscope,
 	 (const pthread_attr_t *attr, int *scope), (attr, scope), 0)
 FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 8d45952f8e..9741969c4c 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_setschedpolicy = __pthread_attr_setschedpolicy,
     .ptr_pthread_attr_getscope = __pthread_attr_getscope,
     .ptr_pthread_attr_setscope = __pthread_attr_setscope,
     .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 84aed530e3..927ac5a706 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_setschedpolicy) (pthread_attr_t *, int);
   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 *);
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index d1d7754821..2f3fd8b2a9 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
 GLIBC_2.17 pthread_attr_setaffinity_np F
 GLIBC_2.17 pthread_attr_setguardsize F
-GLIBC_2.17 pthread_attr_setschedpolicy F
 GLIBC_2.17 pthread_attr_setscope F
 GLIBC_2.17 pthread_attr_setstack F
 GLIBC_2.17 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 5642844e3b..782582e22f 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -45,7 +45,6 @@ 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_setschedpolicy 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 ecacce2795..3802f5d147 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -110,7 +110,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setschedpolicy F
 GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index ecacce2795..3802f5d147 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -110,7 +110,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setschedpolicy F
 GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 0f16a6377b..5a787cd973 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -83,7 +83,6 @@ GLIBC_2.29 pthread_attr_getstackaddr F
 GLIBC_2.29 pthread_attr_getstacksize F
 GLIBC_2.29 pthread_attr_setaffinity_np F
 GLIBC_2.29 pthread_attr_setguardsize F
-GLIBC_2.29 pthread_attr_setschedpolicy F
 GLIBC_2.29 pthread_attr_setscope F
 GLIBC_2.29 pthread_attr_setstack F
 GLIBC_2.29 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index 87201aece7..a3ce51c38d 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index 8bc06163fb..db97003d8b 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -45,7 +45,6 @@ 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_setschedpolicy 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 3e1a27c136..fce31e5cf6 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index ecacce2795..3802f5d147 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -110,7 +110,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setschedpolicy F
 GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index 8bc06163fb..db97003d8b 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -45,7 +45,6 @@ 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_setschedpolicy 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 fa983ba8e4..9bcadbe98b 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F
 GLIBC_2.18 pthread_attr_getstacksize F
 GLIBC_2.18 pthread_attr_setaffinity_np F
 GLIBC_2.18 pthread_attr_setguardsize F
-GLIBC_2.18 pthread_attr_setschedpolicy F
 GLIBC_2.18 pthread_attr_setscope F
 GLIBC_2.18 pthread_attr_setstack F
 GLIBC_2.18 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index fa983ba8e4..9bcadbe98b 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F
 GLIBC_2.18 pthread_attr_getstacksize F
 GLIBC_2.18 pthread_attr_setaffinity_np F
 GLIBC_2.18 pthread_attr_setguardsize F
-GLIBC_2.18 pthread_attr_setschedpolicy F
 GLIBC_2.18 pthread_attr_setscope F
 GLIBC_2.18 pthread_attr_setstack F
 GLIBC_2.18 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 75cfef4e76..0f9ed9ce97 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -45,7 +45,6 @@ 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_setschedpolicy 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 75cfef4e76..0f9ed9ce97 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -45,7 +45,6 @@ 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_setschedpolicy 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 4f2274f567..9427133d75 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.21 pthread_attr_getstackaddr F
 GLIBC_2.21 pthread_attr_getstacksize F
 GLIBC_2.21 pthread_attr_setaffinity_np F
 GLIBC_2.21 pthread_attr_setguardsize F
-GLIBC_2.21 pthread_attr_setschedpolicy F
 GLIBC_2.21 pthread_attr_setscope F
 GLIBC_2.21 pthread_attr_setstack F
 GLIBC_2.21 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index e26440b447..8ef7663e56 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -45,7 +45,6 @@ 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_setschedpolicy 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 a2d98b1cc4..c8374e3ef5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -96,7 +96,6 @@ GLIBC_2.3 pthread_attr_getstack F
 GLIBC_2.3 pthread_attr_getstackaddr F
 GLIBC_2.3 pthread_attr_getstacksize F
 GLIBC_2.3 pthread_attr_setguardsize F
-GLIBC_2.3 pthread_attr_setschedpolicy F
 GLIBC_2.3 pthread_attr_setscope F
 GLIBC_2.3 pthread_attr_setstack F
 GLIBC_2.3 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index d1d7754821..2f3fd8b2a9 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
 GLIBC_2.17 pthread_attr_setaffinity_np F
 GLIBC_2.17 pthread_attr_setguardsize F
-GLIBC_2.17 pthread_attr_setschedpolicy F
 GLIBC_2.17 pthread_attr_setscope F
 GLIBC_2.17 pthread_attr_setstack F
 GLIBC_2.17 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 58e845dc0f..21ad813060 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -72,7 +72,6 @@ GLIBC_2.27 pthread_attr_getstackaddr F
 GLIBC_2.27 pthread_attr_getstacksize F
 GLIBC_2.27 pthread_attr_setaffinity_np F
 GLIBC_2.27 pthread_attr_setguardsize F
-GLIBC_2.27 pthread_attr_setschedpolicy F
 GLIBC_2.27 pthread_attr_setscope F
 GLIBC_2.27 pthread_attr_setstack F
 GLIBC_2.27 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index defd68fee7..2535211071 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -45,7 +45,6 @@ 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_setschedpolicy 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 214241aefd..820b340f5e 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -78,7 +78,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index 87201aece7..a3ce51c38d 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index 87201aece7..a3ce51c38d 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 5642844e3b..782582e22f 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -45,7 +45,6 @@ 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_setschedpolicy 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 3e1a27c136..fce31e5cf6 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 214eaaa15a..a5ad630f1e 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -76,7 +76,6 @@ GLIBC_2.2.5 pthread_attr_getstack F
 GLIBC_2.2.5 pthread_attr_getstackaddr F
 GLIBC_2.2.5 pthread_attr_getstacksize F
 GLIBC_2.2.5 pthread_attr_setguardsize F
-GLIBC_2.2.5 pthread_attr_setschedpolicy F
 GLIBC_2.2.5 pthread_attr_setscope F
 GLIBC_2.2.5 pthread_attr_setstack F
 GLIBC_2.2.5 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 733a412700..595ca1a710 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.16 pthread_attr_getstackaddr F
 GLIBC_2.16 pthread_attr_getstacksize F
 GLIBC_2.16 pthread_attr_setaffinity_np F
 GLIBC_2.16 pthread_attr_setguardsize F
-GLIBC_2.16 pthread_attr_setschedpolicy F
 GLIBC_2.16 pthread_attr_setscope F
 GLIBC_2.16 pthread_attr_setstack F
 GLIBC_2.16 pthread_attr_setstackaddr F
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 05/13] nptl: Move pthread_attr_getscope implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (3 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 04/13] nptl: Move pthread_attr_setschedpolicy " Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:40   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 06/13] nptl: Move pthread_attr_setscope " Florian Weimer
                   ` (7 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

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(-)

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 \
@@ -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 \
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;
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)
 
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,
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
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 06/13] nptl: Move pthread_attr_setscope implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (4 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 05/13] nptl: Move pthread_attr_getscope " Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:41   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 07/13] nptl: Move pthread_condattr_destroy " Florian Weimer
                   ` (6 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

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                                                | 4 ----
 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, 1 insertion(+), 36 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index 9a51922e55..04770ea7a5 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -48,6 +48,7 @@ routines = \
   pthread_attr_setinheritsched \
   pthread_attr_setschedparam \
   pthread_attr_setschedpolicy \
+  pthread_attr_setscope \
   pthread_equal \
   pthread_self \
   register-atfork \
@@ -75,7 +76,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_getschedparam pthread_setschedparam \
 		      pthread_setschedprio \
 		      pthread_attr_getguardsize pthread_attr_setguardsize \
-		      pthread_attr_setscope \
 		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
 		      pthread_attr_getstacksize pthread_attr_setstacksize \
 		      pthread_attr_getstack pthread_attr_setstack \
diff --git a/nptl/Versions b/nptl/Versions
index 88b4266287..5b4852a905 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -49,8 +49,6 @@ libpthread {
 
     pthread_getschedparam; pthread_setschedparam;
 
-    pthread_attr_setscope;
-
     pthread_mutex_init; pthread_mutex_destroy;
     pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;
 
diff --git a/nptl/forward.c b/nptl/forward.c
index 43f9eb699f..2076495a8b 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -56,10 +56,6 @@ name decl								      \
   FORWARD2 (name, int, decl, params, return defretval)
 
 
-FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
-	 (attr, scope), 0)
-
-
 FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
 FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
 
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 5ccd69341d..2078c561a8 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_setscope = __pthread_attr_setscope,
     .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
     .ptr_pthread_condattr_init = __pthread_condattr_init,
     .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index a38f9d7fc6..38c2c0595a 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_setscope) (pthread_attr_t *, int);
   int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
   int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
   int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 1c1eefb3fd..1bf8ccf282 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -74,7 +74,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
 GLIBC_2.17 pthread_attr_setaffinity_np F
 GLIBC_2.17 pthread_attr_setguardsize F
-GLIBC_2.17 pthread_attr_setscope F
 GLIBC_2.17 pthread_attr_setstack F
 GLIBC_2.17 pthread_attr_setstackaddr F
 GLIBC_2.17 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 7c971026f3..ac7b1b2ae8 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_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 1a3cd91b02..1c4307b259 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 1a3cd91b02..1c4307b259 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index e201451825..92ac903a4f 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -82,7 +82,6 @@ GLIBC_2.29 pthread_attr_getstackaddr F
 GLIBC_2.29 pthread_attr_getstacksize F
 GLIBC_2.29 pthread_attr_setaffinity_np F
 GLIBC_2.29 pthread_attr_setguardsize F
-GLIBC_2.29 pthread_attr_setscope F
 GLIBC_2.29 pthread_attr_setstack F
 GLIBC_2.29 pthread_attr_setstackaddr F
 GLIBC_2.29 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index a0759ebc70..c2dade43aa 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index dab30e943d..a60edd4cbc 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_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index ccf83eb5c2..8a414d895d 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 1a3cd91b02..1c4307b259 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
 GLIBC_2.4 pthread_attr_getstacksize F
 GLIBC_2.4 pthread_attr_setaffinity_np F
 GLIBC_2.4 pthread_attr_setguardsize F
-GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
 GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index dab30e943d..a60edd4cbc 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_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index 185936524a..83352bdc1f 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -74,7 +74,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F
 GLIBC_2.18 pthread_attr_getstacksize F
 GLIBC_2.18 pthread_attr_setaffinity_np F
 GLIBC_2.18 pthread_attr_setguardsize F
-GLIBC_2.18 pthread_attr_setscope F
 GLIBC_2.18 pthread_attr_setstack F
 GLIBC_2.18 pthread_attr_setstackaddr F
 GLIBC_2.18 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index 185936524a..83352bdc1f 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -74,7 +74,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F
 GLIBC_2.18 pthread_attr_getstacksize F
 GLIBC_2.18 pthread_attr_setaffinity_np F
 GLIBC_2.18 pthread_attr_setguardsize F
-GLIBC_2.18 pthread_attr_setscope F
 GLIBC_2.18 pthread_attr_setstack F
 GLIBC_2.18 pthread_attr_setstackaddr F
 GLIBC_2.18 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 0a4c17b029..2a19dd6c91 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_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 0a4c17b029..2a19dd6c91 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_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index edf8c19b72..3c2a84e3ae 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -74,7 +74,6 @@ GLIBC_2.21 pthread_attr_getstackaddr F
 GLIBC_2.21 pthread_attr_getstacksize F
 GLIBC_2.21 pthread_attr_setaffinity_np F
 GLIBC_2.21 pthread_attr_setguardsize F
-GLIBC_2.21 pthread_attr_setscope F
 GLIBC_2.21 pthread_attr_setstack F
 GLIBC_2.21 pthread_attr_setstackaddr F
 GLIBC_2.21 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 2e80e3be32..cb75099001 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_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 6f12c83064..8cf2fbfc72 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -95,7 +95,6 @@ GLIBC_2.3 pthread_attr_getstack F
 GLIBC_2.3 pthread_attr_getstackaddr F
 GLIBC_2.3 pthread_attr_getstacksize F
 GLIBC_2.3 pthread_attr_setguardsize F
-GLIBC_2.3 pthread_attr_setscope F
 GLIBC_2.3 pthread_attr_setstack F
 GLIBC_2.3 pthread_attr_setstackaddr F
 GLIBC_2.3 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index 1c1eefb3fd..1bf8ccf282 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -74,7 +74,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
 GLIBC_2.17 pthread_attr_setaffinity_np F
 GLIBC_2.17 pthread_attr_setguardsize F
-GLIBC_2.17 pthread_attr_setscope F
 GLIBC_2.17 pthread_attr_setstack F
 GLIBC_2.17 pthread_attr_setstackaddr F
 GLIBC_2.17 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 60a6f89b6f..86184ee17b 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -71,7 +71,6 @@ GLIBC_2.27 pthread_attr_getstackaddr F
 GLIBC_2.27 pthread_attr_getstacksize F
 GLIBC_2.27 pthread_attr_setaffinity_np F
 GLIBC_2.27 pthread_attr_setguardsize F
-GLIBC_2.27 pthread_attr_setscope F
 GLIBC_2.27 pthread_attr_setstack F
 GLIBC_2.27 pthread_attr_setstackaddr F
 GLIBC_2.27 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index d37af9c62b..33d54c6c41 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_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 964eb077d9..8298c36976 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -77,7 +77,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index a0759ebc70..c2dade43aa 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index a0759ebc70..c2dade43aa 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 7c971026f3..ac7b1b2ae8 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_setscope F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
 GLIBC_2.0 pthread_cond_destroy F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index ccf83eb5c2..8a414d895d 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_getstackaddr F
 GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_setguardsize F
-GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
 GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 0a4c6b3361..62b52ec607 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -75,7 +75,6 @@ GLIBC_2.2.5 pthread_attr_getstack F
 GLIBC_2.2.5 pthread_attr_getstackaddr F
 GLIBC_2.2.5 pthread_attr_getstacksize F
 GLIBC_2.2.5 pthread_attr_setguardsize F
-GLIBC_2.2.5 pthread_attr_setscope F
 GLIBC_2.2.5 pthread_attr_setstack F
 GLIBC_2.2.5 pthread_attr_setstackaddr F
 GLIBC_2.2.5 pthread_attr_setstacksize F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 35352d5b3f..7597021f4f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -74,7 +74,6 @@ GLIBC_2.16 pthread_attr_getstackaddr F
 GLIBC_2.16 pthread_attr_getstacksize F
 GLIBC_2.16 pthread_attr_setaffinity_np F
 GLIBC_2.16 pthread_attr_setguardsize F
-GLIBC_2.16 pthread_attr_setscope F
 GLIBC_2.16 pthread_attr_setstack F
 GLIBC_2.16 pthread_attr_setstackaddr F
 GLIBC_2.16 pthread_attr_setstacksize F
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 07/13] nptl: Move pthread_condattr_destroy implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (5 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 06/13] nptl: Move pthread_attr_setscope " Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:42   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 08/13] nptl: Move pthread_condattr_init " Florian Weimer
                   ` (5 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

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                                                 | 1 -
 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(+), 32 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index 04770ea7a5..3102b839eb 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -49,6 +49,7 @@ routines = \
   pthread_attr_setschedparam \
   pthread_attr_setschedpolicy \
   pthread_attr_setscope \
+  pthread_condattr_destroy \
   pthread_equal \
   pthread_self \
   register-atfork \
@@ -106,7 +107,7 @@ 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_destroy \
+		      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 5b4852a905..22dc309522 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -58,7 +58,7 @@ libpthread {
     pthread_cond_wait; pthread_cond_timedwait;
     pthread_cond_signal; pthread_cond_broadcast;
 
-    pthread_condattr_destroy; pthread_condattr_init;
+    pthread_condattr_init;
 
     pthread_cancel; pthread_testcancel;
     pthread_setcancelstate; pthread_setcanceltype;
diff --git a/nptl/forward.c b/nptl/forward.c
index 2076495a8b..cf32d8cd3c 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -56,7 +56,6 @@ name decl								      \
   FORWARD2 (name, int, decl, params, return defretval)
 
 
-FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
 FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
 
 #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 2078c561a8..d8298d2392 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_destroy = __pthread_condattr_destroy,
     .ptr_pthread_condattr_init = __pthread_condattr_init,
     .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
     .ptr___pthread_cond_destroy = __pthread_cond_destroy,
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 38c2c0595a..165032b2cc 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_destroy) (pthread_condattr_t *);
   int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
   int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
   int (*ptr___pthread_cond_destroy) (pthread_cond_t *);
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 1bf8ccf282..4727f24896 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.17 pthread_cond_init F
 GLIBC_2.17 pthread_cond_signal F
 GLIBC_2.17 pthread_cond_timedwait F
 GLIBC_2.17 pthread_cond_wait F
-GLIBC_2.17 pthread_condattr_destroy F
 GLIBC_2.17 pthread_condattr_getclock F
 GLIBC_2.17 pthread_condattr_getpshared F
 GLIBC_2.17 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index ac7b1b2ae8..ff9ad17e83 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_destroy F
 GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 1c4307b259..686b98104e 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -126,7 +126,6 @@ GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
-GLIBC_2.4 pthread_condattr_destroy F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
 GLIBC_2.4 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 1c4307b259..686b98104e 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -126,7 +126,6 @@ GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
-GLIBC_2.4 pthread_condattr_destroy F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
 GLIBC_2.4 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 92ac903a4f..67138b844b 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -99,7 +99,6 @@ GLIBC_2.29 pthread_cond_init F
 GLIBC_2.29 pthread_cond_signal F
 GLIBC_2.29 pthread_cond_timedwait F
 GLIBC_2.29 pthread_cond_wait F
-GLIBC_2.29 pthread_condattr_destroy F
 GLIBC_2.29 pthread_condattr_getclock F
 GLIBC_2.29 pthread_condattr_getpshared F
 GLIBC_2.29 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index c2dade43aa..bdc4e1755a 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
 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_destroy F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index a60edd4cbc..9ae156fd27 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_destroy F
 GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 8a414d895d..78cb476094 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
 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_destroy F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 1c4307b259..686b98104e 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -126,7 +126,6 @@ GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
-GLIBC_2.4 pthread_condattr_destroy F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
 GLIBC_2.4 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index a60edd4cbc..9ae156fd27 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_destroy F
 GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index 83352bdc1f..b819c21dcb 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.18 pthread_cond_init F
 GLIBC_2.18 pthread_cond_signal F
 GLIBC_2.18 pthread_cond_timedwait F
 GLIBC_2.18 pthread_cond_wait F
-GLIBC_2.18 pthread_condattr_destroy F
 GLIBC_2.18 pthread_condattr_getclock F
 GLIBC_2.18 pthread_condattr_getpshared F
 GLIBC_2.18 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index 83352bdc1f..b819c21dcb 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.18 pthread_cond_init F
 GLIBC_2.18 pthread_cond_signal F
 GLIBC_2.18 pthread_cond_timedwait F
 GLIBC_2.18 pthread_cond_wait F
-GLIBC_2.18 pthread_condattr_destroy F
 GLIBC_2.18 pthread_condattr_getclock F
 GLIBC_2.18 pthread_condattr_getpshared F
 GLIBC_2.18 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 2a19dd6c91..404b7f8868 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_destroy F
 GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 2a19dd6c91..404b7f8868 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_destroy F
 GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 3c2a84e3ae..8710edf723 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.21 pthread_cond_init F
 GLIBC_2.21 pthread_cond_signal F
 GLIBC_2.21 pthread_cond_timedwait F
 GLIBC_2.21 pthread_cond_wait F
-GLIBC_2.21 pthread_condattr_destroy F
 GLIBC_2.21 pthread_condattr_getclock F
 GLIBC_2.21 pthread_condattr_getpshared F
 GLIBC_2.21 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index cb75099001..b42ad93959 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_destroy F
 GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 8cf2fbfc72..86430a78ac 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -111,7 +111,6 @@ GLIBC_2.3 pthread_cond_init F
 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_destroy F
 GLIBC_2.3 pthread_condattr_getpshared F
 GLIBC_2.3 pthread_condattr_init F
 GLIBC_2.3 pthread_condattr_setpshared F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index 1bf8ccf282..4727f24896 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.17 pthread_cond_init F
 GLIBC_2.17 pthread_cond_signal F
 GLIBC_2.17 pthread_cond_timedwait F
 GLIBC_2.17 pthread_cond_wait F
-GLIBC_2.17 pthread_condattr_destroy F
 GLIBC_2.17 pthread_condattr_getclock F
 GLIBC_2.17 pthread_condattr_getpshared F
 GLIBC_2.17 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 86184ee17b..cb3a6a8344 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -88,7 +88,6 @@ GLIBC_2.27 pthread_cond_init F
 GLIBC_2.27 pthread_cond_signal F
 GLIBC_2.27 pthread_cond_timedwait F
 GLIBC_2.27 pthread_cond_wait F
-GLIBC_2.27 pthread_condattr_destroy F
 GLIBC_2.27 pthread_condattr_getclock F
 GLIBC_2.27 pthread_condattr_getpshared F
 GLIBC_2.27 pthread_condattr_init F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index 33d54c6c41..6700046b59 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_destroy F
 GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 8298c36976..b9a663c25d 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -93,7 +93,6 @@ GLIBC_2.2 pthread_cond_init F
 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_destroy F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index c2dade43aa..bdc4e1755a 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
 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_destroy F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index c2dade43aa..bdc4e1755a 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
 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_destroy F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index ac7b1b2ae8..ff9ad17e83 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_destroy F
 GLIBC_2.0 pthread_condattr_init F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 8a414d895d..78cb476094 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
 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_destroy F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_init F
 GLIBC_2.2 pthread_condattr_setpshared F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 62b52ec607..12b8d05921 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.2.5 pthread_cond_init F
 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_destroy 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
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 7597021f4f..451a473a58 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -91,7 +91,6 @@ GLIBC_2.16 pthread_cond_init F
 GLIBC_2.16 pthread_cond_signal F
 GLIBC_2.16 pthread_cond_timedwait F
 GLIBC_2.16 pthread_cond_wait F
-GLIBC_2.16 pthread_condattr_destroy F
 GLIBC_2.16 pthread_condattr_getclock F
 GLIBC_2.16 pthread_condattr_getpshared F
 GLIBC_2.16 pthread_condattr_init F
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 08/13] nptl: Move pthread_condattr_init implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (6 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 07/13] nptl: Move pthread_condattr_destroy " Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:42   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 09/13] nptl: Move pthread_cond_destroy " Florian Weimer
                   ` (4 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

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(-)

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
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 09/13] nptl: Move pthread_cond_destroy implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (7 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 08/13] nptl: Move pthread_condattr_init " Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:48   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 10/13] nptl: Move pthread_cond_init " Florian Weimer
                   ` (3 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

It is necessary to export __pthread_cond_destroy from libc because
the C11 condition variable needs it and is still left in libpthread.

This is part of the libpthread removal project:

  <https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>
---
 nptl/Makefile                                          |  6 ++++--
 nptl/Versions                                          |  6 ++++--
 nptl/forward.c                                         | 10 ----------
 nptl/nptl-init.c                                       |  2 --
 nptl/old_pthread_cond_destroy.c                        |  4 ++--
 nptl/pthreadP.h                                        |  1 +
 nptl/pthread_cond_destroy.c                            |  3 ++-
 sysdeps/nptl/pthread-functions.h                       |  2 --
 sysdeps/unix/sysv/linux/aarch64/libpthread.abilist     |  1 -
 sysdeps/unix/sysv/linux/alpha/libpthread.abilist       |  2 --
 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        |  2 --
 sysdeps/unix/sysv/linux/i386/libpthread.abilist        |  2 --
 sysdeps/unix/sysv/linux/ia64/libpthread.abilist        |  2 --
 .../unix/sysv/linux/m68k/coldfire/libpthread.abilist   |  1 -
 sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist |  2 --
 .../unix/sysv/linux/microblaze/be/libpthread.abilist   |  1 -
 .../unix/sysv/linux/microblaze/le/libpthread.abilist   |  1 -
 sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist |  2 --
 sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist |  2 --
 sysdeps/unix/sysv/linux/nios2/libpthread.abilist       |  1 -
 .../sysv/linux/powerpc/powerpc32/libpthread.abilist    |  2 --
 .../sysv/linux/powerpc/powerpc64/be/libpthread.abilist |  2 --
 .../sysv/linux/powerpc/powerpc64/le/libpthread.abilist |  1 -
 sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist  |  1 -
 .../unix/sysv/linux/s390/s390-32/libpthread.abilist    |  2 --
 .../unix/sysv/linux/s390/s390-64/libpthread.abilist    |  2 --
 sysdeps/unix/sysv/linux/sh/be/libpthread.abilist       |  2 --
 sysdeps/unix/sysv/linux/sh/le/libpthread.abilist       |  2 --
 .../unix/sysv/linux/sparc/sparc32/libpthread.abilist   |  2 --
 .../unix/sysv/linux/sparc/sparc64/libpthread.abilist   |  2 --
 sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist   |  2 --
 sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist  |  1 -
 35 files changed, 13 insertions(+), 64 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index b14a64e693..19f11a5c9a 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -36,6 +36,7 @@ routines = \
   libc-lowlevellock \
   libc_multiple_threads \
   libc_pthread_init \
+  old_pthread_cond_destroy \
   pthread_atfork \
   pthread_attr_destroy \
   pthread_attr_getdetachstate \
@@ -49,6 +50,7 @@ routines = \
   pthread_attr_setschedparam \
   pthread_attr_setschedpolicy \
   pthread_attr_setscope \
+  pthread_cond_destroy \
   pthread_condattr_destroy \
   pthread_condattr_init \
   pthread_equal \
@@ -102,10 +104,10 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_rwlockattr_setpshared \
 		      pthread_rwlockattr_getkind_np \
 		      pthread_rwlockattr_setkind_np \
-		      pthread_cond_init pthread_cond_destroy \
+		      pthread_cond_init \
 		      pthread_cond_wait \
 		      pthread_cond_signal pthread_cond_broadcast \
-		      old_pthread_cond_init old_pthread_cond_destroy \
+		      old_pthread_cond_init \
 		      old_pthread_cond_wait old_pthread_cond_timedwait \
 		      old_pthread_cond_signal old_pthread_cond_broadcast \
 		      pthread_condattr_getpshared pthread_condattr_setpshared \
diff --git a/nptl/Versions b/nptl/Versions
index bc1bad0562..4dbe68d76c 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -39,6 +39,8 @@ libc {
     __libc_pthread_init;
     __libc_current_sigrtmin_private; __libc_current_sigrtmax_private;
     __libc_allocate_rtsig_private;
+    # Used by the C11 threads implementation.
+    __pthread_cond_destroy;
   }
 }
 
@@ -54,7 +56,7 @@ libpthread {
 
     pthread_mutexattr_init; pthread_mutexattr_destroy;
 
-    pthread_cond_init; pthread_cond_destroy;
+    pthread_cond_init;
     pthread_cond_wait; pthread_cond_timedwait;
     pthread_cond_signal; pthread_cond_broadcast;
 
@@ -193,7 +195,7 @@ libpthread {
 
   GLIBC_2.3.2 {
     # Changed pthread_cond_t.
-    pthread_cond_init; pthread_cond_destroy;
+    pthread_cond_init;
     pthread_cond_wait; pthread_cond_timedwait;
     pthread_cond_signal; pthread_cond_broadcast;
   }
diff --git a/nptl/forward.c b/nptl/forward.c
index 9383ada753..3e1734854e 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -66,16 +66,6 @@ FORWARD (__pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
 versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast,
 		  GLIBC_2_3_2);
 
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
-FORWARD2 (__pthread_cond_destroy_2_0, int attribute_compat_text_section,
-	  (pthread_cond_2_0_t *cond), (cond), return 0)
-compat_symbol (libc, __pthread_cond_destroy_2_0, pthread_cond_destroy,
-	       GLIBC_2_0);
-#endif
-FORWARD (__pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0)
-versioned_symbol (libc, __pthread_cond_destroy, pthread_cond_destroy,
-		  GLIBC_2_3_2);
-
 #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 FORWARD2 (__pthread_cond_init_2_0, int attribute_compat_text_section,
 	  (pthread_cond_2_0_t *cond, const pthread_condattr_t *cond_attr),
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 563ab7b1e8..9e17a2be6d 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -73,14 +73,12 @@ void __nptl_set_robust (struct pthread *);
 static const struct pthread_functions pthread_functions =
   {
     .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
-    .ptr___pthread_cond_destroy = __pthread_cond_destroy,
     .ptr___pthread_cond_init = __pthread_cond_init,
     .ptr___pthread_cond_signal = __pthread_cond_signal,
     .ptr___pthread_cond_wait = __pthread_cond_wait,
     .ptr___pthread_cond_timedwait = __pthread_cond_timedwait,
 # if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
     .ptr___pthread_cond_broadcast_2_0 = __pthread_cond_broadcast_2_0,
-    .ptr___pthread_cond_destroy_2_0 = __pthread_cond_destroy_2_0,
     .ptr___pthread_cond_init_2_0 = __pthread_cond_init_2_0,
     .ptr___pthread_cond_signal_2_0 = __pthread_cond_signal_2_0,
     .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
diff --git a/nptl/old_pthread_cond_destroy.c b/nptl/old_pthread_cond_destroy.c
index 46dad05d49..4996deceb8 100644
--- a/nptl/old_pthread_cond_destroy.c
+++ b/nptl/old_pthread_cond_destroy.c
@@ -21,7 +21,7 @@
 #include <shlib-compat.h>
 
 
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 int
 __pthread_cond_destroy_2_0 (pthread_cond_2_0_t *cond)
 {
@@ -30,6 +30,6 @@ __pthread_cond_destroy_2_0 (pthread_cond_2_0_t *cond)
 
   return 0;
 }
-compat_symbol (libpthread, __pthread_cond_destroy_2_0, pthread_cond_destroy,
+compat_symbol (libc, __pthread_cond_destroy_2_0, pthread_cond_destroy,
 	       GLIBC_2_0);
 #endif
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 7e0ab8ef42..f348c75d90 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -442,6 +442,7 @@ extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
 extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
 extern int __pthread_cond_broadcast (pthread_cond_t *cond);
 extern int __pthread_cond_destroy (pthread_cond_t *cond);
+libc_hidden_proto (__pthread_cond_destroy)
 extern int __pthread_cond_init (pthread_cond_t *cond,
 				const pthread_condattr_t *cond_attr);
 extern int __pthread_cond_signal (pthread_cond_t *cond);
diff --git a/nptl/pthread_cond_destroy.c b/nptl/pthread_cond_destroy.c
index 168546574b..31034905d1 100644
--- a/nptl/pthread_cond_destroy.c
+++ b/nptl/pthread_cond_destroy.c
@@ -58,5 +58,6 @@ __pthread_cond_destroy (pthread_cond_t *cond)
   /* The memory the condvar occupies can now be reused.  */
   return 0;
 }
-versioned_symbol (libpthread, __pthread_cond_destroy,
+libc_hidden_def (__pthread_cond_destroy)
+versioned_symbol (libc, __pthread_cond_destroy,
 		  pthread_cond_destroy, GLIBC_2_3_2);
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 25c05bf4d8..ceb1cc631d 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -31,7 +31,6 @@ struct xid_command;
 struct pthread_functions
 {
   int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
-  int (*ptr___pthread_cond_destroy) (pthread_cond_t *);
   int (*ptr___pthread_cond_init) (pthread_cond_t *,
 				  const pthread_condattr_t *);
   int (*ptr___pthread_cond_signal) (pthread_cond_t *);
@@ -39,7 +38,6 @@ struct pthread_functions
   int (*ptr___pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
 				       const struct timespec *);
   int (*ptr___pthread_cond_broadcast_2_0) (pthread_cond_2_0_t *);
-  int (*ptr___pthread_cond_destroy_2_0) (pthread_cond_2_0_t *);
   int (*ptr___pthread_cond_init_2_0) (pthread_cond_2_0_t *,
 				      const pthread_condattr_t *);
   int (*ptr___pthread_cond_signal_2_0) (pthread_cond_2_0_t *);
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index d5b247d1bd..6237b22222 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.17 pthread_barrierattr_init F
 GLIBC_2.17 pthread_barrierattr_setpshared F
 GLIBC_2.17 pthread_cancel F
 GLIBC_2.17 pthread_cond_broadcast F
-GLIBC_2.17 pthread_cond_destroy F
 GLIBC_2.17 pthread_cond_init F
 GLIBC_2.17 pthread_cond_signal F
 GLIBC_2.17 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 391be30e38..be6e5dcd3d 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -46,7 +46,6 @@ GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_destroy F
 GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
@@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 862b5d30be..3016511f3e 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_destroy F
 GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 862b5d30be..3016511f3e 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_destroy F
 GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 04559140c9..e33492d3d2 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -94,7 +94,6 @@ GLIBC_2.29 pthread_barrierattr_init F
 GLIBC_2.29 pthread_barrierattr_setpshared F
 GLIBC_2.29 pthread_cancel F
 GLIBC_2.29 pthread_cond_broadcast F
-GLIBC_2.29 pthread_cond_destroy F
 GLIBC_2.29 pthread_cond_init F
 GLIBC_2.29 pthread_cond_signal F
 GLIBC_2.29 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index aa0c6d1da0..1ac88709aa 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_destroy F
 GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
@@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index b815b155b5..d9e2a3bf91 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -46,7 +46,6 @@ GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_destroy F
 GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
@@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 283e0e6f9d..a2be53b8c5 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_destroy F
 GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
@@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 862b5d30be..3016511f3e 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_destroy F
 GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index b815b155b5..d9e2a3bf91 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_destroy F
 GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
@@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index e1ffc40cd9..30fd457419 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.18 pthread_barrierattr_init F
 GLIBC_2.18 pthread_barrierattr_setpshared F
 GLIBC_2.18 pthread_cancel F
 GLIBC_2.18 pthread_cond_broadcast F
-GLIBC_2.18 pthread_cond_destroy F
 GLIBC_2.18 pthread_cond_init F
 GLIBC_2.18 pthread_cond_signal F
 GLIBC_2.18 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index e1ffc40cd9..30fd457419 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.18 pthread_barrierattr_init F
 GLIBC_2.18 pthread_barrierattr_setpshared F
 GLIBC_2.18 pthread_cancel F
 GLIBC_2.18 pthread_cond_broadcast F
-GLIBC_2.18 pthread_cond_destroy F
 GLIBC_2.18 pthread_cond_init F
 GLIBC_2.18 pthread_cond_signal F
 GLIBC_2.18 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 70169b45b4..2d5730fc8f 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_destroy F
 GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
@@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 70169b45b4..2d5730fc8f 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_destroy F
 GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
@@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 6baae4309c..94f6396182 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.21 pthread_barrierattr_init F
 GLIBC_2.21 pthread_barrierattr_setpshared F
 GLIBC_2.21 pthread_cancel F
 GLIBC_2.21 pthread_cond_broadcast F
-GLIBC_2.21 pthread_cond_destroy F
 GLIBC_2.21 pthread_cond_init F
 GLIBC_2.21 pthread_cond_signal F
 GLIBC_2.21 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 0dd3739a03..62e8dba625 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_destroy F
 GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
@@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 8d4fa60131..ada466504c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -106,7 +106,6 @@ GLIBC_2.3 pthread_barrierattr_init F
 GLIBC_2.3 pthread_barrierattr_setpshared F
 GLIBC_2.3 pthread_cancel F
 GLIBC_2.3 pthread_cond_broadcast F
-GLIBC_2.3 pthread_cond_destroy F
 GLIBC_2.3 pthread_cond_init F
 GLIBC_2.3 pthread_cond_signal F
 GLIBC_2.3 pthread_cond_timedwait F
@@ -196,7 +195,6 @@ GLIBC_2.3 system F
 GLIBC_2.3 tcdrain F
 GLIBC_2.3 write F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index d5b247d1bd..6237b22222 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.17 pthread_barrierattr_init F
 GLIBC_2.17 pthread_barrierattr_setpshared F
 GLIBC_2.17 pthread_cancel F
 GLIBC_2.17 pthread_cond_broadcast F
-GLIBC_2.17 pthread_cond_destroy F
 GLIBC_2.17 pthread_cond_init F
 GLIBC_2.17 pthread_cond_signal F
 GLIBC_2.17 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index e3391617d6..30a1e15e90 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -83,7 +83,6 @@ GLIBC_2.27 pthread_barrierattr_init F
 GLIBC_2.27 pthread_barrierattr_setpshared F
 GLIBC_2.27 pthread_cancel F
 GLIBC_2.27 pthread_cond_broadcast F
-GLIBC_2.27 pthread_cond_destroy F
 GLIBC_2.27 pthread_cond_init F
 GLIBC_2.27 pthread_cond_signal F
 GLIBC_2.27 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index ff80259a92..a9a8c7630e 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_destroy F
 GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
@@ -208,7 +207,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 02d7c0409a..7052913b40 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -88,7 +88,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_destroy F
 GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
@@ -200,7 +199,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index aa0c6d1da0..1ac88709aa 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_destroy F
 GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
@@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index aa0c6d1da0..1ac88709aa 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_destroy F
 GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
@@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 391be30e38..be6e5dcd3d 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_destroy F
 GLIBC_2.0 pthread_cond_init F
 GLIBC_2.0 pthread_cond_signal F
 GLIBC_2.0 pthread_cond_timedwait F
@@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 283e0e6f9d..a2be53b8c5 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_destroy F
 GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
@@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 35835c89d9..90780c92d4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2.5 pthread_barrierattr_init F
 GLIBC_2.2.5 pthread_barrierattr_setpshared F
 GLIBC_2.2.5 pthread_cancel F
 GLIBC_2.2.5 pthread_cond_broadcast F
-GLIBC_2.2.5 pthread_cond_destroy F
 GLIBC_2.2.5 pthread_cond_init F
 GLIBC_2.2.5 pthread_cond_signal F
 GLIBC_2.2.5 pthread_cond_timedwait F
@@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_destroy F
 GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 4b27550ad0..b24b7b637e 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.16 pthread_barrierattr_init F
 GLIBC_2.16 pthread_barrierattr_setpshared F
 GLIBC_2.16 pthread_cancel F
 GLIBC_2.16 pthread_cond_broadcast F
-GLIBC_2.16 pthread_cond_destroy F
 GLIBC_2.16 pthread_cond_init F
 GLIBC_2.16 pthread_cond_signal F
 GLIBC_2.16 pthread_cond_timedwait F
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 10/13] nptl: Move pthread_cond_init implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (8 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 09/13] nptl: Move pthread_cond_destroy " Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:50   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 11/13] Add hidden prototypes for __sched_getparam, __sched_getscheduler Florian Weimer
                   ` (2 subsequent siblings)
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

It is necessary to export __pthread_cond_init from libc because
the C11 condition variable needs it and is still left in libpthread.

This is part of the libpthread removal project:

  <https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>
---
 nptl/Makefile                                         |  4 ++--
 nptl/Versions                                         |  3 +--
 nptl/forward.c                                        | 11 -----------
 nptl/nptl-init.c                                      |  2 --
 nptl/old_pthread_cond_init.c                          |  4 ++--
 nptl/pthreadP.h                                       |  1 +
 nptl/pthread_cond_init.c                              |  3 ++-
 sysdeps/nptl/pthread-functions.h                      |  4 ----
 sysdeps/unix/sysv/linux/aarch64/libpthread.abilist    |  1 -
 sysdeps/unix/sysv/linux/alpha/libpthread.abilist      |  2 --
 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       |  2 --
 sysdeps/unix/sysv/linux/i386/libpthread.abilist       |  2 --
 sysdeps/unix/sysv/linux/ia64/libpthread.abilist       |  2 --
 .../unix/sysv/linux/m68k/coldfire/libpthread.abilist  |  1 -
 .../unix/sysv/linux/m68k/m680x0/libpthread.abilist    |  2 --
 .../unix/sysv/linux/microblaze/be/libpthread.abilist  |  1 -
 .../unix/sysv/linux/microblaze/le/libpthread.abilist  |  1 -
 .../unix/sysv/linux/mips/mips32/libpthread.abilist    |  2 --
 .../unix/sysv/linux/mips/mips64/libpthread.abilist    |  2 --
 sysdeps/unix/sysv/linux/nios2/libpthread.abilist      |  1 -
 .../sysv/linux/powerpc/powerpc32/libpthread.abilist   |  2 --
 .../linux/powerpc/powerpc64/be/libpthread.abilist     |  2 --
 .../linux/powerpc/powerpc64/le/libpthread.abilist     |  1 -
 sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist |  1 -
 .../unix/sysv/linux/s390/s390-32/libpthread.abilist   |  2 --
 .../unix/sysv/linux/s390/s390-64/libpthread.abilist   |  2 --
 sysdeps/unix/sysv/linux/sh/be/libpthread.abilist      |  2 --
 sysdeps/unix/sysv/linux/sh/le/libpthread.abilist      |  2 --
 .../unix/sysv/linux/sparc/sparc32/libpthread.abilist  |  2 --
 .../unix/sysv/linux/sparc/sparc64/libpthread.abilist  |  2 --
 sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist  |  2 --
 sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist |  1 -
 35 files changed, 8 insertions(+), 67 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index 19f11a5c9a..eb87ecb1b3 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -37,6 +37,7 @@ routines = \
   libc_multiple_threads \
   libc_pthread_init \
   old_pthread_cond_destroy \
+  old_pthread_cond_init \
   pthread_atfork \
   pthread_attr_destroy \
   pthread_attr_getdetachstate \
@@ -51,6 +52,7 @@ routines = \
   pthread_attr_setschedpolicy \
   pthread_attr_setscope \
   pthread_cond_destroy \
+  pthread_cond_init \
   pthread_condattr_destroy \
   pthread_condattr_init \
   pthread_equal \
@@ -104,10 +106,8 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_rwlockattr_setpshared \
 		      pthread_rwlockattr_getkind_np \
 		      pthread_rwlockattr_setkind_np \
-		      pthread_cond_init \
 		      pthread_cond_wait \
 		      pthread_cond_signal pthread_cond_broadcast \
-		      old_pthread_cond_init \
 		      old_pthread_cond_wait old_pthread_cond_timedwait \
 		      old_pthread_cond_signal old_pthread_cond_broadcast \
 		      pthread_condattr_getpshared pthread_condattr_setpshared \
diff --git a/nptl/Versions b/nptl/Versions
index 4dbe68d76c..914404c45e 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -40,7 +40,7 @@ libc {
     __libc_current_sigrtmin_private; __libc_current_sigrtmax_private;
     __libc_allocate_rtsig_private;
     # Used by the C11 threads implementation.
-    __pthread_cond_destroy;
+    __pthread_cond_destroy; __pthread_cond_init;
   }
 }
 
@@ -56,7 +56,6 @@ libpthread {
 
     pthread_mutexattr_init; pthread_mutexattr_destroy;
 
-    pthread_cond_init;
     pthread_cond_wait; pthread_cond_timedwait;
     pthread_cond_signal; pthread_cond_broadcast;
 
diff --git a/nptl/forward.c b/nptl/forward.c
index 3e1734854e..6ee4b92d52 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -66,17 +66,6 @@ FORWARD (__pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
 versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast,
 		  GLIBC_2_3_2);
 
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
-FORWARD2 (__pthread_cond_init_2_0, int attribute_compat_text_section,
-	  (pthread_cond_2_0_t *cond, const pthread_condattr_t *cond_attr),
-	  (cond, cond_attr), return 0)
-compat_symbol (libc, __pthread_cond_init_2_0, pthread_cond_init, GLIBC_2_0);
-#endif
-FORWARD (__pthread_cond_init,
-	 (pthread_cond_t *cond, const pthread_condattr_t *cond_attr),
-	 (cond, cond_attr), 0)
-versioned_symbol (libc, __pthread_cond_init, pthread_cond_init, GLIBC_2_3_2);
-
 #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 FORWARD2 (__pthread_cond_signal_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 9e17a2be6d..56a4848d6e 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -73,13 +73,11 @@ void __nptl_set_robust (struct pthread *);
 static const struct pthread_functions pthread_functions =
   {
     .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
-    .ptr___pthread_cond_init = __pthread_cond_init,
     .ptr___pthread_cond_signal = __pthread_cond_signal,
     .ptr___pthread_cond_wait = __pthread_cond_wait,
     .ptr___pthread_cond_timedwait = __pthread_cond_timedwait,
 # if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
     .ptr___pthread_cond_broadcast_2_0 = __pthread_cond_broadcast_2_0,
-    .ptr___pthread_cond_init_2_0 = __pthread_cond_init_2_0,
     .ptr___pthread_cond_signal_2_0 = __pthread_cond_signal_2_0,
     .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
     .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
diff --git a/nptl/old_pthread_cond_init.c b/nptl/old_pthread_cond_init.c
index df0f1fd7e8..d71aa802b8 100644
--- a/nptl/old_pthread_cond_init.c
+++ b/nptl/old_pthread_cond_init.c
@@ -21,7 +21,7 @@
 #include <shlib-compat.h>
 
 
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 int
 __pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
 			 const pthread_condattr_t *cond_attr)
@@ -40,6 +40,6 @@ __pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
 
   return 0;
 }
-compat_symbol (libpthread, __pthread_cond_init_2_0, pthread_cond_init,
+compat_symbol (libc, __pthread_cond_init_2_0, pthread_cond_init,
 	       GLIBC_2_0);
 #endif
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index f348c75d90..edf381d820 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -445,6 +445,7 @@ extern int __pthread_cond_destroy (pthread_cond_t *cond);
 libc_hidden_proto (__pthread_cond_destroy)
 extern int __pthread_cond_init (pthread_cond_t *cond,
 				const pthread_condattr_t *cond_attr);
+libc_hidden_proto (__pthread_cond_init)
 extern int __pthread_cond_signal (pthread_cond_t *cond);
 extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
 extern int __pthread_cond_timedwait (pthread_cond_t *cond,
diff --git a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c
index 1dce2ed46e..595b1b3528 100644
--- a/nptl/pthread_cond_init.c
+++ b/nptl/pthread_cond_init.c
@@ -49,5 +49,6 @@ __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr)
 
   return 0;
 }
-versioned_symbol (libpthread, __pthread_cond_init,
+libc_hidden_def (__pthread_cond_init)
+versioned_symbol (libc, __pthread_cond_init,
 		  pthread_cond_init, GLIBC_2_3_2);
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index ceb1cc631d..9e12cf7f20 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -31,15 +31,11 @@ struct xid_command;
 struct pthread_functions
 {
   int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
-  int (*ptr___pthread_cond_init) (pthread_cond_t *,
-				  const pthread_condattr_t *);
   int (*ptr___pthread_cond_signal) (pthread_cond_t *);
   int (*ptr___pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
   int (*ptr___pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
 				       const struct timespec *);
   int (*ptr___pthread_cond_broadcast_2_0) (pthread_cond_2_0_t *);
-  int (*ptr___pthread_cond_init_2_0) (pthread_cond_2_0_t *,
-				      const pthread_condattr_t *);
   int (*ptr___pthread_cond_signal_2_0) (pthread_cond_2_0_t *);
   int (*ptr___pthread_cond_wait_2_0) (pthread_cond_2_0_t *, pthread_mutex_t *);
   int (*ptr___pthread_cond_timedwait_2_0) (pthread_cond_2_0_t *,
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 6237b22222..ca00e45ff6 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.17 pthread_barrierattr_init F
 GLIBC_2.17 pthread_barrierattr_setpshared F
 GLIBC_2.17 pthread_cancel F
 GLIBC_2.17 pthread_cond_broadcast F
-GLIBC_2.17 pthread_cond_init F
 GLIBC_2.17 pthread_cond_signal F
 GLIBC_2.17 pthread_cond_timedwait F
 GLIBC_2.17 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index be6e5dcd3d..7a678786d7 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -46,7 +46,6 @@ GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-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
@@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 3016511f3e..cc36449cfd 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 3016511f3e..cc36449cfd 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index e33492d3d2..eacb6a19f7 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -94,7 +94,6 @@ GLIBC_2.29 pthread_barrierattr_init F
 GLIBC_2.29 pthread_barrierattr_setpshared F
 GLIBC_2.29 pthread_cancel F
 GLIBC_2.29 pthread_cond_broadcast F
-GLIBC_2.29 pthread_cond_init F
 GLIBC_2.29 pthread_cond_signal F
 GLIBC_2.29 pthread_cond_timedwait F
 GLIBC_2.29 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index 1ac88709aa..251d48e7e3 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
@@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index d9e2a3bf91..51a734aafc 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -46,7 +46,6 @@ GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-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
@@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index a2be53b8c5..ea8f277428 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
@@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 3016511f3e..cc36449cfd 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_init F
 GLIBC_2.4 pthread_cond_signal F
 GLIBC_2.4 pthread_cond_timedwait F
 GLIBC_2.4 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index d9e2a3bf91..51a734aafc 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-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
@@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index 30fd457419..f431bf8a5d 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.18 pthread_barrierattr_init F
 GLIBC_2.18 pthread_barrierattr_setpshared F
 GLIBC_2.18 pthread_cancel F
 GLIBC_2.18 pthread_cond_broadcast F
-GLIBC_2.18 pthread_cond_init F
 GLIBC_2.18 pthread_cond_signal F
 GLIBC_2.18 pthread_cond_timedwait F
 GLIBC_2.18 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index 30fd457419..f431bf8a5d 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.18 pthread_barrierattr_init F
 GLIBC_2.18 pthread_barrierattr_setpshared F
 GLIBC_2.18 pthread_cancel F
 GLIBC_2.18 pthread_cond_broadcast F
-GLIBC_2.18 pthread_cond_init F
 GLIBC_2.18 pthread_cond_signal F
 GLIBC_2.18 pthread_cond_timedwait F
 GLIBC_2.18 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 2d5730fc8f..fe97a30c54 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-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
@@ -204,7 +203,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 2d5730fc8f..fe97a30c54 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-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
@@ -204,7 +203,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 94f6396182..26e2a33bbe 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.21 pthread_barrierattr_init F
 GLIBC_2.21 pthread_barrierattr_setpshared F
 GLIBC_2.21 pthread_cancel F
 GLIBC_2.21 pthread_cond_broadcast F
-GLIBC_2.21 pthread_cond_init F
 GLIBC_2.21 pthread_cond_signal F
 GLIBC_2.21 pthread_cond_timedwait F
 GLIBC_2.21 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 62e8dba625..0b9363ab7a 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-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
@@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index ada466504c..6b0da1ac89 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -106,7 +106,6 @@ GLIBC_2.3 pthread_barrierattr_init F
 GLIBC_2.3 pthread_barrierattr_setpshared F
 GLIBC_2.3 pthread_cancel F
 GLIBC_2.3 pthread_cond_broadcast F
-GLIBC_2.3 pthread_cond_init F
 GLIBC_2.3 pthread_cond_signal F
 GLIBC_2.3 pthread_cond_timedwait F
 GLIBC_2.3 pthread_cond_wait F
@@ -195,7 +194,6 @@ GLIBC_2.3 system F
 GLIBC_2.3 tcdrain F
 GLIBC_2.3 write F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index 6237b22222..ca00e45ff6 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.17 pthread_barrierattr_init F
 GLIBC_2.17 pthread_barrierattr_setpshared F
 GLIBC_2.17 pthread_cancel F
 GLIBC_2.17 pthread_cond_broadcast F
-GLIBC_2.17 pthread_cond_init F
 GLIBC_2.17 pthread_cond_signal F
 GLIBC_2.17 pthread_cond_timedwait F
 GLIBC_2.17 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 30a1e15e90..52b91a3f46 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -83,7 +83,6 @@ GLIBC_2.27 pthread_barrierattr_init F
 GLIBC_2.27 pthread_barrierattr_setpshared F
 GLIBC_2.27 pthread_cancel F
 GLIBC_2.27 pthread_cond_broadcast F
-GLIBC_2.27 pthread_cond_init F
 GLIBC_2.27 pthread_cond_signal F
 GLIBC_2.27 pthread_cond_timedwait F
 GLIBC_2.27 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index a9a8c7630e..b84a2bf02f 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-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
@@ -207,7 +206,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 7052913b40..e85906c843 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -88,7 +88,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
@@ -199,7 +198,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index 1ac88709aa..251d48e7e3 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
@@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index 1ac88709aa..251d48e7e3 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
@@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index be6e5dcd3d..7a678786d7 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 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_cond_broadcast F
-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
@@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index a2be53b8c5..ea8f277428 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_init F
 GLIBC_2.2 pthread_cond_signal F
 GLIBC_2.2 pthread_cond_timedwait F
 GLIBC_2.2 pthread_cond_wait F
@@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 90780c92d4..dc3231b3d8 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.2.5 pthread_barrierattr_init F
 GLIBC_2.2.5 pthread_barrierattr_setpshared F
 GLIBC_2.2.5 pthread_cancel F
 GLIBC_2.2.5 pthread_cond_broadcast F
-GLIBC_2.2.5 pthread_cond_init F
 GLIBC_2.2.5 pthread_cond_signal F
 GLIBC_2.2.5 pthread_cond_timedwait F
 GLIBC_2.2.5 pthread_cond_wait F
@@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_init F
 GLIBC_2.3.2 pthread_cond_signal F
 GLIBC_2.3.2 pthread_cond_timedwait F
 GLIBC_2.3.2 pthread_cond_wait F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index b24b7b637e..dda01deac9 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -86,7 +86,6 @@ GLIBC_2.16 pthread_barrierattr_init F
 GLIBC_2.16 pthread_barrierattr_setpshared F
 GLIBC_2.16 pthread_cancel F
 GLIBC_2.16 pthread_cond_broadcast F
-GLIBC_2.16 pthread_cond_init F
 GLIBC_2.16 pthread_cond_signal F
 GLIBC_2.16 pthread_cond_timedwait F
 GLIBC_2.16 pthread_cond_wait F
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 11/13] Add hidden prototypes for __sched_getparam, __sched_getscheduler
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (9 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 10/13] nptl: Move pthread_cond_init " Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:50   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 12/13] nptl: Move pthread_getschedparam implementation into libc Florian Weimer
  2020-02-11 11:06 ` [PATCH 13/13] nptl: Move pthread_setschedparam " Florian Weimer
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

This will enable them to be used in libc.so without PLTs.
---
 include/sched.h    | 2 ++
 posix/sched_getp.c | 1 +
 posix/sched_gets.c | 1 +
 3 files changed, 4 insertions(+)

diff --git a/include/sched.h b/include/sched.h
index 4abc440176..b0bf971c93 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -7,10 +7,12 @@ extern int __sched_setparam (__pid_t __pid,
 			     const struct sched_param *__param);
 libc_hidden_proto (__sched_setparam)
 extern int __sched_getparam (__pid_t __pid, struct sched_param *__param);
+libc_hidden_proto (__sched_getparam)
 extern int __sched_setscheduler (__pid_t __pid, int __policy,
 				 const struct sched_param *__param);
 libc_hidden_proto (__sched_setscheduler)
 extern int __sched_getscheduler (__pid_t __pid);
+libc_hidden_proto (__sched_getscheduler)
 extern int __sched_yield (void);
 libc_hidden_proto (__sched_yield)
 extern int __sched_get_priority_max (int __algorithm);
diff --git a/posix/sched_getp.c b/posix/sched_getp.c
index 32a5087850..014ea0f7ce 100644
--- a/posix/sched_getp.c
+++ b/posix/sched_getp.c
@@ -27,6 +27,7 @@ __sched_getparam (pid_t pid, struct sched_param *param)
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (__sched_getparam)
 stub_warning (sched_getparam)
 
 weak_alias (__sched_getparam, sched_getparam)
diff --git a/posix/sched_gets.c b/posix/sched_gets.c
index 356e2f22fe..07dd67054f 100644
--- a/posix/sched_gets.c
+++ b/posix/sched_gets.c
@@ -27,6 +27,7 @@ __sched_getscheduler (pid_t pid)
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (__sched_getscheduler)
 stub_warning (sched_getscheduler)
 
 weak_alias (__sched_getscheduler, sched_getscheduler)
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 12/13] nptl: Move pthread_getschedparam implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (10 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 11/13] Add hidden prototypes for __sched_getparam, __sched_getscheduler Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:51   ` Adhemerval Zanella
  2020-02-11 11:06 ` [PATCH 13/13] nptl: Move pthread_setschedparam " Florian Weimer
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

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                                                 | 3 ---
 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(+), 34 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index eb87ecb1b3..f6a05799ad 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -56,6 +56,7 @@ routines = \
   pthread_condattr_destroy \
   pthread_condattr_init \
   pthread_equal \
+  pthread_getschedparam \
   pthread_self \
   register-atfork \
 
@@ -79,7 +80,7 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_join pthread_tryjoin pthread_timedjoin \
 		      pthread_clockjoin pthread_join_common pthread_yield \
 		      pthread_getconcurrency pthread_setconcurrency \
-		      pthread_getschedparam pthread_setschedparam \
+		      pthread_setschedparam \
 		      pthread_setschedprio \
 		      pthread_attr_getguardsize pthread_attr_setguardsize \
 		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
diff --git a/nptl/Versions b/nptl/Versions
index 914404c45e..ccf7be396b 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -49,7 +49,7 @@ libpthread {
     pthread_create; pthread_join;
     pthread_exit; pthread_detach;
 
-    pthread_getschedparam; pthread_setschedparam;
+    pthread_setschedparam;
 
     pthread_mutex_init; pthread_mutex_destroy;
     pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;
diff --git a/nptl/forward.c b/nptl/forward.c
index 6ee4b92d52..f84f7795a2 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -108,9 +108,6 @@ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
 strong_alias (__pthread_exit, pthread_exit);
 
 
-FORWARD (pthread_getschedparam,
-	 (pthread_t target_thread, int *policy, struct sched_param *param),
-	 (target_thread, policy, param), 0)
 FORWARD (pthread_setschedparam,
 	 (pthread_t target_thread, int policy,
 	  const struct sched_param *param), (target_thread, policy, param), 0)
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 56a4848d6e..3f6a777d59 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -83,7 +83,6 @@ static const struct pthread_functions pthread_functions =
     .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
 # endif
     .ptr___pthread_exit = __pthread_exit,
-    .ptr_pthread_getschedparam = __pthread_getschedparam,
     .ptr_pthread_setschedparam = __pthread_setschedparam,
     .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
     .ptr_pthread_mutex_init = __pthread_mutex_init,
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 9e12cf7f20..337ef59691 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -42,7 +42,6 @@ struct pthread_functions
 					   pthread_mutex_t *,
 					   const struct timespec *);
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
-  int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
   int (*ptr_pthread_setschedparam) (pthread_t, int,
 				    const struct sched_param *);
   int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index ca00e45ff6..a0cff69954 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -101,7 +101,6 @@ GLIBC_2.17 pthread_getattr_np F
 GLIBC_2.17 pthread_getconcurrency F
 GLIBC_2.17 pthread_getcpuclockid F
 GLIBC_2.17 pthread_getname_np F
-GLIBC_2.17 pthread_getschedparam F
 GLIBC_2.17 pthread_getspecific F
 GLIBC_2.17 pthread_join F
 GLIBC_2.17 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 7a678786d7..bb718e4037 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
-GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_join F
 GLIBC_2.0 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index cc36449cfd..cabc278df8 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -135,7 +135,6 @@ GLIBC_2.4 pthread_getaffinity_np F
 GLIBC_2.4 pthread_getattr_np F
 GLIBC_2.4 pthread_getconcurrency F
 GLIBC_2.4 pthread_getcpuclockid F
-GLIBC_2.4 pthread_getschedparam F
 GLIBC_2.4 pthread_getspecific F
 GLIBC_2.4 pthread_join F
 GLIBC_2.4 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index cc36449cfd..cabc278df8 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -135,7 +135,6 @@ GLIBC_2.4 pthread_getaffinity_np F
 GLIBC_2.4 pthread_getattr_np F
 GLIBC_2.4 pthread_getconcurrency F
 GLIBC_2.4 pthread_getcpuclockid F
-GLIBC_2.4 pthread_getschedparam F
 GLIBC_2.4 pthread_getspecific F
 GLIBC_2.4 pthread_join F
 GLIBC_2.4 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index eacb6a19f7..394fe5e560 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -110,7 +110,6 @@ GLIBC_2.29 pthread_getattr_np F
 GLIBC_2.29 pthread_getconcurrency F
 GLIBC_2.29 pthread_getcpuclockid F
 GLIBC_2.29 pthread_getname_np F
-GLIBC_2.29 pthread_getschedparam F
 GLIBC_2.29 pthread_getspecific F
 GLIBC_2.29 pthread_join F
 GLIBC_2.29 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index 251d48e7e3..f3606ce4e8 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
-GLIBC_2.2 pthread_getschedparam F
 GLIBC_2.2 pthread_getspecific F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index 51a734aafc..5a6a1d775c 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
-GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_join F
 GLIBC_2.0 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index ea8f277428..e7545c83b5 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
-GLIBC_2.2 pthread_getschedparam F
 GLIBC_2.2 pthread_getspecific F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index cc36449cfd..cabc278df8 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -135,7 +135,6 @@ GLIBC_2.4 pthread_getaffinity_np F
 GLIBC_2.4 pthread_getattr_np F
 GLIBC_2.4 pthread_getconcurrency F
 GLIBC_2.4 pthread_getcpuclockid F
-GLIBC_2.4 pthread_getschedparam F
 GLIBC_2.4 pthread_getspecific F
 GLIBC_2.4 pthread_join F
 GLIBC_2.4 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index 51a734aafc..5a6a1d775c 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
-GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_join F
 GLIBC_2.0 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index f431bf8a5d..fa5c6d2773 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -102,7 +102,6 @@ GLIBC_2.18 pthread_getattr_np F
 GLIBC_2.18 pthread_getconcurrency F
 GLIBC_2.18 pthread_getcpuclockid F
 GLIBC_2.18 pthread_getname_np F
-GLIBC_2.18 pthread_getschedparam F
 GLIBC_2.18 pthread_getspecific F
 GLIBC_2.18 pthread_join F
 GLIBC_2.18 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index f431bf8a5d..fa5c6d2773 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -102,7 +102,6 @@ GLIBC_2.18 pthread_getattr_np F
 GLIBC_2.18 pthread_getconcurrency F
 GLIBC_2.18 pthread_getcpuclockid F
 GLIBC_2.18 pthread_getname_np F
-GLIBC_2.18 pthread_getschedparam F
 GLIBC_2.18 pthread_getspecific F
 GLIBC_2.18 pthread_join F
 GLIBC_2.18 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index fe97a30c54..2a2343cf68 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
-GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_join F
 GLIBC_2.0 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index fe97a30c54..2a2343cf68 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
-GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_join F
 GLIBC_2.0 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 26e2a33bbe..f454c862a8 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -102,7 +102,6 @@ GLIBC_2.21 pthread_getattr_np F
 GLIBC_2.21 pthread_getconcurrency F
 GLIBC_2.21 pthread_getcpuclockid F
 GLIBC_2.21 pthread_getname_np F
-GLIBC_2.21 pthread_getschedparam F
 GLIBC_2.21 pthread_getspecific F
 GLIBC_2.21 pthread_join F
 GLIBC_2.21 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 0b9363ab7a..4d3332216f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
-GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_join F
 GLIBC_2.0 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 6b0da1ac89..ecc6a3bd60 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -117,7 +117,6 @@ GLIBC_2.3 pthread_exit F
 GLIBC_2.3 pthread_getattr_np F
 GLIBC_2.3 pthread_getconcurrency F
 GLIBC_2.3 pthread_getcpuclockid F
-GLIBC_2.3 pthread_getschedparam F
 GLIBC_2.3 pthread_getspecific F
 GLIBC_2.3 pthread_join F
 GLIBC_2.3 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index ca00e45ff6..a0cff69954 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -101,7 +101,6 @@ GLIBC_2.17 pthread_getattr_np F
 GLIBC_2.17 pthread_getconcurrency F
 GLIBC_2.17 pthread_getcpuclockid F
 GLIBC_2.17 pthread_getname_np F
-GLIBC_2.17 pthread_getschedparam F
 GLIBC_2.17 pthread_getspecific F
 GLIBC_2.17 pthread_join F
 GLIBC_2.17 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 52b91a3f46..1e998668f7 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -99,7 +99,6 @@ GLIBC_2.27 pthread_getattr_np F
 GLIBC_2.27 pthread_getconcurrency F
 GLIBC_2.27 pthread_getcpuclockid F
 GLIBC_2.27 pthread_getname_np F
-GLIBC_2.27 pthread_getschedparam F
 GLIBC_2.27 pthread_getspecific F
 GLIBC_2.27 pthread_join F
 GLIBC_2.27 pthread_key_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 b84a2bf02f..9495b0300b 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
-GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_join F
 GLIBC_2.0 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index e85906c843..6de0b3c2bb 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -98,7 +98,6 @@ GLIBC_2.2 pthread_detach F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
-GLIBC_2.2 pthread_getschedparam F
 GLIBC_2.2 pthread_getspecific F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index 251d48e7e3..f3606ce4e8 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
-GLIBC_2.2 pthread_getschedparam F
 GLIBC_2.2 pthread_getspecific F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index 251d48e7e3..f3606ce4e8 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
-GLIBC_2.2 pthread_getschedparam F
 GLIBC_2.2 pthread_getspecific F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 7a678786d7..bb718e4037 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_exit F
-GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
 GLIBC_2.0 pthread_join F
 GLIBC_2.0 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index ea8f277428..e7545c83b5 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
-GLIBC_2.2 pthread_getschedparam F
 GLIBC_2.2 pthread_getspecific F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index dc3231b3d8..2071b125e8 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -97,7 +97,6 @@ GLIBC_2.2.5 pthread_exit F
 GLIBC_2.2.5 pthread_getattr_np F
 GLIBC_2.2.5 pthread_getconcurrency F
 GLIBC_2.2.5 pthread_getcpuclockid F
-GLIBC_2.2.5 pthread_getschedparam F
 GLIBC_2.2.5 pthread_getspecific F
 GLIBC_2.2.5 pthread_join F
 GLIBC_2.2.5 pthread_key_create F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index dda01deac9..102f4fb1ff 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -101,7 +101,6 @@ GLIBC_2.16 pthread_getattr_np F
 GLIBC_2.16 pthread_getconcurrency F
 GLIBC_2.16 pthread_getcpuclockid F
 GLIBC_2.16 pthread_getname_np F
-GLIBC_2.16 pthread_getschedparam F
 GLIBC_2.16 pthread_getspecific F
 GLIBC_2.16 pthread_join F
 GLIBC_2.16 pthread_key_create F
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [PATCH 13/13] nptl: Move pthread_setschedparam implementation into libc
  2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
                   ` (11 preceding siblings ...)
  2020-02-11 11:06 ` [PATCH 12/13] nptl: Move pthread_getschedparam implementation into libc Florian Weimer
@ 2020-02-11 11:06 ` Florian Weimer
  2020-02-19 17:52   ` Adhemerval Zanella
  12 siblings, 1 reply; 28+ messages in thread
From: Florian Weimer @ 2020-02-11 11:06 UTC (permalink / raw)
  To: libc-alpha

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                                               | 5 -----
 nptl/nptl-init.c                                             | 1 -
 sysdeps/nptl/pthread-functions.h                             | 2 --
 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, 1 insertion(+), 38 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index f6a05799ad..b34110c986 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -58,6 +58,7 @@ routines = \
   pthread_equal \
   pthread_getschedparam \
   pthread_self \
+  pthread_setschedparam \
   register-atfork \
 
 shared-only-routines = forward
@@ -80,7 +81,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_join pthread_tryjoin pthread_timedjoin \
 		      pthread_clockjoin pthread_join_common pthread_yield \
 		      pthread_getconcurrency pthread_setconcurrency \
-		      pthread_setschedparam \
 		      pthread_setschedprio \
 		      pthread_attr_getguardsize pthread_attr_setguardsize \
 		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
diff --git a/nptl/Versions b/nptl/Versions
index ccf7be396b..543dddc4ee 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -49,8 +49,6 @@ libpthread {
     pthread_create; pthread_join;
     pthread_exit; pthread_detach;
 
-    pthread_setschedparam;
-
     pthread_mutex_init; pthread_mutex_destroy;
     pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;
 
diff --git a/nptl/forward.c b/nptl/forward.c
index f84f7795a2..d486c9fec9 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -108,11 +108,6 @@ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
 strong_alias (__pthread_exit, pthread_exit);
 
 
-FORWARD (pthread_setschedparam,
-	 (pthread_t target_thread, int policy,
-	  const struct sched_param *param), (target_thread, policy, param), 0)
-
-
 FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0)
 
 FORWARD (pthread_mutex_init,
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 3f6a777d59..ef7d3a4a4a 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -83,7 +83,6 @@ static const struct pthread_functions pthread_functions =
     .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
 # endif
     .ptr___pthread_exit = __pthread_exit,
-    .ptr_pthread_setschedparam = __pthread_setschedparam,
     .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
     .ptr_pthread_mutex_init = __pthread_mutex_init,
     .ptr_pthread_mutex_lock = __pthread_mutex_lock,
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 337ef59691..294b7e1119 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -42,8 +42,6 @@ struct pthread_functions
 					   pthread_mutex_t *,
 					   const struct timespec *);
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
-  int (*ptr_pthread_setschedparam) (pthread_t, int,
-				    const struct sched_param *);
   int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
   int (*ptr_pthread_mutex_init) (pthread_mutex_t *,
 				 const pthread_mutexattr_t *);
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index a0cff69954..d65beba958 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -154,7 +154,6 @@ GLIBC_2.17 pthread_setcancelstate F
 GLIBC_2.17 pthread_setcanceltype F
 GLIBC_2.17 pthread_setconcurrency F
 GLIBC_2.17 pthread_setname_np F
-GLIBC_2.17 pthread_setschedparam F
 GLIBC_2.17 pthread_setschedprio F
 GLIBC_2.17 pthread_setspecific F
 GLIBC_2.17 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index bb718e4037..ffd443422d 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
 GLIBC_2.0 pthread_once F
 GLIBC_2.0 pthread_setcancelstate F
 GLIBC_2.0 pthread_setcanceltype F
-GLIBC_2.0 pthread_setschedparam F
 GLIBC_2.0 pthread_setspecific F
 GLIBC_2.0 pthread_sigmask F
 GLIBC_2.0 pthread_testcancel F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index cabc278df8..129c64b0a7 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -184,7 +184,6 @@ GLIBC_2.4 pthread_setaffinity_np F
 GLIBC_2.4 pthread_setcancelstate F
 GLIBC_2.4 pthread_setcanceltype F
 GLIBC_2.4 pthread_setconcurrency F
-GLIBC_2.4 pthread_setschedparam F
 GLIBC_2.4 pthread_setschedprio F
 GLIBC_2.4 pthread_setspecific F
 GLIBC_2.4 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index cabc278df8..129c64b0a7 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -184,7 +184,6 @@ GLIBC_2.4 pthread_setaffinity_np F
 GLIBC_2.4 pthread_setcancelstate F
 GLIBC_2.4 pthread_setcanceltype F
 GLIBC_2.4 pthread_setconcurrency F
-GLIBC_2.4 pthread_setschedparam F
 GLIBC_2.4 pthread_setschedprio F
 GLIBC_2.4 pthread_setspecific F
 GLIBC_2.4 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 394fe5e560..8b72528819 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -164,7 +164,6 @@ GLIBC_2.29 pthread_setcancelstate F
 GLIBC_2.29 pthread_setcanceltype F
 GLIBC_2.29 pthread_setconcurrency F
 GLIBC_2.29 pthread_setname_np F
-GLIBC_2.29 pthread_setschedparam F
 GLIBC_2.29 pthread_setschedprio F
 GLIBC_2.29 pthread_setspecific F
 GLIBC_2.29 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index f3606ce4e8..84fa775d95 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
 GLIBC_2.2 pthread_setcancelstate F
 GLIBC_2.2 pthread_setcanceltype F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 pthread_setschedparam F
 GLIBC_2.2 pthread_setspecific F
 GLIBC_2.2 pthread_sigmask F
 GLIBC_2.2 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index 5a6a1d775c..4727bd5d43 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
 GLIBC_2.0 pthread_once F
 GLIBC_2.0 pthread_setcancelstate F
 GLIBC_2.0 pthread_setcanceltype F
-GLIBC_2.0 pthread_setschedparam F
 GLIBC_2.0 pthread_setspecific F
 GLIBC_2.0 pthread_sigmask F
 GLIBC_2.0 pthread_testcancel F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index e7545c83b5..3d947a66aa 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
 GLIBC_2.2 pthread_setcancelstate F
 GLIBC_2.2 pthread_setcanceltype F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 pthread_setschedparam F
 GLIBC_2.2 pthread_setspecific F
 GLIBC_2.2 pthread_sigmask F
 GLIBC_2.2 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index cabc278df8..129c64b0a7 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -184,7 +184,6 @@ GLIBC_2.4 pthread_setaffinity_np F
 GLIBC_2.4 pthread_setcancelstate F
 GLIBC_2.4 pthread_setcanceltype F
 GLIBC_2.4 pthread_setconcurrency F
-GLIBC_2.4 pthread_setschedparam F
 GLIBC_2.4 pthread_setschedprio F
 GLIBC_2.4 pthread_setspecific F
 GLIBC_2.4 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index 5a6a1d775c..4727bd5d43 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
 GLIBC_2.0 pthread_once F
 GLIBC_2.0 pthread_setcancelstate F
 GLIBC_2.0 pthread_setcanceltype F
-GLIBC_2.0 pthread_setschedparam F
 GLIBC_2.0 pthread_setspecific F
 GLIBC_2.0 pthread_sigmask F
 GLIBC_2.0 pthread_testcancel F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index fa5c6d2773..78885c05cf 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -156,7 +156,6 @@ GLIBC_2.18 pthread_setcancelstate F
 GLIBC_2.18 pthread_setcanceltype F
 GLIBC_2.18 pthread_setconcurrency F
 GLIBC_2.18 pthread_setname_np F
-GLIBC_2.18 pthread_setschedparam F
 GLIBC_2.18 pthread_setschedprio F
 GLIBC_2.18 pthread_setspecific F
 GLIBC_2.18 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index fa5c6d2773..78885c05cf 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -156,7 +156,6 @@ GLIBC_2.18 pthread_setcancelstate F
 GLIBC_2.18 pthread_setcanceltype F
 GLIBC_2.18 pthread_setconcurrency F
 GLIBC_2.18 pthread_setname_np F
-GLIBC_2.18 pthread_setschedparam F
 GLIBC_2.18 pthread_setschedprio F
 GLIBC_2.18 pthread_setspecific F
 GLIBC_2.18 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 2a2343cf68..62f7a3f349 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
 GLIBC_2.0 pthread_once F
 GLIBC_2.0 pthread_setcancelstate F
 GLIBC_2.0 pthread_setcanceltype F
-GLIBC_2.0 pthread_setschedparam F
 GLIBC_2.0 pthread_setspecific F
 GLIBC_2.0 pthread_sigmask F
 GLIBC_2.0 pthread_testcancel F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 2a2343cf68..62f7a3f349 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
 GLIBC_2.0 pthread_once F
 GLIBC_2.0 pthread_setcancelstate F
 GLIBC_2.0 pthread_setcanceltype F
-GLIBC_2.0 pthread_setschedparam F
 GLIBC_2.0 pthread_setspecific F
 GLIBC_2.0 pthread_sigmask F
 GLIBC_2.0 pthread_testcancel F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index f454c862a8..45ebcf5a6c 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -156,7 +156,6 @@ GLIBC_2.21 pthread_setcancelstate F
 GLIBC_2.21 pthread_setcanceltype F
 GLIBC_2.21 pthread_setconcurrency F
 GLIBC_2.21 pthread_setname_np F
-GLIBC_2.21 pthread_setschedparam F
 GLIBC_2.21 pthread_setschedprio F
 GLIBC_2.21 pthread_setspecific F
 GLIBC_2.21 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 4d3332216f..2f4ed55693 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
 GLIBC_2.0 pthread_once F
 GLIBC_2.0 pthread_setcancelstate F
 GLIBC_2.0 pthread_setcanceltype F
-GLIBC_2.0 pthread_setschedparam F
 GLIBC_2.0 pthread_setspecific F
 GLIBC_2.0 pthread_sigmask F
 GLIBC_2.0 pthread_testcancel F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index ecc6a3bd60..f4d34b1c47 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -156,7 +156,6 @@ GLIBC_2.3 pthread_rwlockattr_setpshared F
 GLIBC_2.3 pthread_setcancelstate F
 GLIBC_2.3 pthread_setcanceltype F
 GLIBC_2.3 pthread_setconcurrency F
-GLIBC_2.3 pthread_setschedparam F
 GLIBC_2.3 pthread_setspecific F
 GLIBC_2.3 pthread_sigmask F
 GLIBC_2.3 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index a0cff69954..d65beba958 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -154,7 +154,6 @@ GLIBC_2.17 pthread_setcancelstate F
 GLIBC_2.17 pthread_setcanceltype F
 GLIBC_2.17 pthread_setconcurrency F
 GLIBC_2.17 pthread_setname_np F
-GLIBC_2.17 pthread_setschedparam F
 GLIBC_2.17 pthread_setschedprio F
 GLIBC_2.17 pthread_setspecific F
 GLIBC_2.17 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 1e998668f7..5610e51e10 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -153,7 +153,6 @@ GLIBC_2.27 pthread_setcancelstate F
 GLIBC_2.27 pthread_setcanceltype F
 GLIBC_2.27 pthread_setconcurrency F
 GLIBC_2.27 pthread_setname_np F
-GLIBC_2.27 pthread_setschedparam F
 GLIBC_2.27 pthread_setschedprio F
 GLIBC_2.27 pthread_setspecific F
 GLIBC_2.27 pthread_sigmask F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index 9495b0300b..80ad434007 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
 GLIBC_2.0 pthread_once F
 GLIBC_2.0 pthread_setcancelstate F
 GLIBC_2.0 pthread_setcanceltype F
-GLIBC_2.0 pthread_setschedparam F
 GLIBC_2.0 pthread_setspecific F
 GLIBC_2.0 pthread_sigmask F
 GLIBC_2.0 pthread_testcancel F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 6de0b3c2bb..daef2b5cd5 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -137,7 +137,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
 GLIBC_2.2 pthread_setcancelstate F
 GLIBC_2.2 pthread_setcanceltype F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 pthread_setschedparam F
 GLIBC_2.2 pthread_setspecific F
 GLIBC_2.2 pthread_sigmask F
 GLIBC_2.2 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index f3606ce4e8..84fa775d95 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
 GLIBC_2.2 pthread_setcancelstate F
 GLIBC_2.2 pthread_setcanceltype F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 pthread_setschedparam F
 GLIBC_2.2 pthread_setspecific F
 GLIBC_2.2 pthread_sigmask F
 GLIBC_2.2 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index f3606ce4e8..84fa775d95 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
 GLIBC_2.2 pthread_setcancelstate F
 GLIBC_2.2 pthread_setcanceltype F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 pthread_setschedparam F
 GLIBC_2.2 pthread_setspecific F
 GLIBC_2.2 pthread_sigmask F
 GLIBC_2.2 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index bb718e4037..ffd443422d 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
 GLIBC_2.0 pthread_once F
 GLIBC_2.0 pthread_setcancelstate F
 GLIBC_2.0 pthread_setcanceltype F
-GLIBC_2.0 pthread_setschedparam F
 GLIBC_2.0 pthread_setspecific F
 GLIBC_2.0 pthread_sigmask F
 GLIBC_2.0 pthread_testcancel F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index e7545c83b5..3d947a66aa 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
 GLIBC_2.2 pthread_setcancelstate F
 GLIBC_2.2 pthread_setcanceltype F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 pthread_setschedparam F
 GLIBC_2.2 pthread_setspecific F
 GLIBC_2.2 pthread_sigmask F
 GLIBC_2.2 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 2071b125e8..a6bc9f4a55 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -136,7 +136,6 @@ GLIBC_2.2.5 pthread_rwlockattr_setpshared F
 GLIBC_2.2.5 pthread_setcancelstate F
 GLIBC_2.2.5 pthread_setcanceltype F
 GLIBC_2.2.5 pthread_setconcurrency F
-GLIBC_2.2.5 pthread_setschedparam F
 GLIBC_2.2.5 pthread_setspecific F
 GLIBC_2.2.5 pthread_sigmask F
 GLIBC_2.2.5 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 102f4fb1ff..17f6ec438f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -154,7 +154,6 @@ GLIBC_2.16 pthread_setcancelstate F
 GLIBC_2.16 pthread_setcanceltype F
 GLIBC_2.16 pthread_setconcurrency F
 GLIBC_2.16 pthread_setname_np F
-GLIBC_2.16 pthread_setschedparam F
 GLIBC_2.16 pthread_setschedprio F
 GLIBC_2.16 pthread_setspecific F
 GLIBC_2.16 pthread_sigmask F
-- 
2.24.1


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* Re: [PATCH 01/13] nptl: Use .NOTPARALLEL in Makefile only if actually running tests
  2020-02-11 11:06 ` [PATCH 01/13] nptl: Use .NOTPARALLEL in Makefile only if actually running tests Florian Weimer
@ 2020-02-19 17:28   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:28 UTC (permalink / raw)
  To: libc-alpha



On 11/02/2020 08:06, Florian Weimer wrote:
> It is safe to build the tests in parallel.

LGTM, thanks.

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

> ---
>  nptl/Makefile | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 6f210d60e3..40f27ea7cd 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -693,7 +693,9 @@ tst-audit-threads-ENV = LD_AUDIT=$(objpfx)tst-audit-threads-mod1.so
>  
>  CFLAGS-tst-unwind-thread.c += -funwind-tables
>  
> -# The tests here better do not run in parallel
> +# The tests here better do not run in parallel.
> +ifeq ($(run-built-tests),yes)
>  ifneq ($(filter %tests,$(MAKECMDGOALS)),)
>  .NOTPARALLEL:
>  endif
> +endif
> 

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 02/13] nptl: Sort routines list in Makefile alphabetically
  2020-02-11 11:06 ` [PATCH 02/13] nptl: Sort routines list in Makefile alphabetically Florian Weimer
@ 2020-02-19 17:34   ` Adhemerval Zanella
  2020-02-20  7:54     ` Florian Weimer
  0 siblings, 1 reply; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:34 UTC (permalink / raw)
  To: libc-alpha



On 11/02/2020 08:06, Florian Weimer wrote:
> This will make it easier to review changes which move implementations
> from libpthread to libc.

This organization does help a lot not only refactoring, but also new
files. Maybe we could enforce it from now one, thoughts?

LGTM, thanks.

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

> ---
>  nptl/Makefile | 28 +++++++++++++++++++++-------
>  1 file changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 40f27ea7cd..cd416f3208 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -28,13 +28,27 @@ headers := pthread.h semaphore.h bits/semaphore.h \
>  extra-libs := libpthread
>  extra-libs-others := $(extra-libs)
>  
> -routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
> -	   libc-cleanup libc_pthread_init libc_multiple_threads \
> -	   register-atfork pthread_atfork pthread_self pthread_equal \
> -	   pthread_attr_destroy pthread_attr_init pthread_attr_getdetachstate \
> -	   pthread_attr_setdetachstate pthread_attr_getinheritsched \
> -	   pthread_attr_setinheritsched pthread_attr_getschedparam \
> -	   pthread_attr_setschedparam
> +routines = \
> +  alloca_cutoff \
> +  forward \
> +  libc-cancellation \
> +  libc-cleanup \
> +  libc-lowlevellock \
> +  libc_multiple_threads \
> +  libc_pthread_init \
> +  pthread_atfork \
> +  pthread_attr_destroy \
> +  pthread_attr_getdetachstate \
> +  pthread_attr_getinheritsched \
> +  pthread_attr_getschedparam \
> +  pthread_attr_init \
> +  pthread_attr_setdetachstate \
> +  pthread_attr_setinheritsched \
> +  pthread_attr_setschedparam \
> +  pthread_equal \
> +  pthread_self \
> +  register-atfork \
> +
>  shared-only-routines = forward
>  static-only-routines = pthread_atfork
>  
> 

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 03/13] nptl: Move pthread_attr_getschedpolicy implementation into libc
  2020-02-11 11:06 ` [PATCH 03/13] nptl: Move pthread_attr_getschedpolicy implementation into libc Florian Weimer
@ 2020-02-19 17:38   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:38 UTC (permalink / raw)
  To: libc-alpha



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 cd416f3208..0eb9cda2e4 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -41,6 +41,7 @@ routines = \
>    pthread_attr_getdetachstate \
>    pthread_attr_getinheritsched \
>    pthread_attr_getschedparam \
> +  pthread_attr_getschedpolicy \
>    pthread_attr_init \
>    pthread_attr_setdetachstate \
>    pthread_attr_setinheritsched \

Ok.

> @@ -72,7 +73,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_getschedpolicy pthread_attr_setschedpolicy \
> +		      pthread_attr_setschedpolicy \
>  		      pthread_attr_getscope pthread_attr_setscope \
>  		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
>  		      pthread_attr_getstacksize pthread_attr_setstacksize \

Ok.

> diff --git a/nptl/Versions b/nptl/Versions
> index ff6fc06002..d8312e70cc 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -49,7 +49,7 @@ libpthread {
>  
>      pthread_getschedparam; pthread_setschedparam;
>  
> -    pthread_attr_getschedpolicy; pthread_attr_setschedpolicy;
> +    pthread_attr_setschedpolicy;
>      pthread_attr_getscope; pthread_attr_setscope;
>  
>      pthread_mutex_init; pthread_mutex_destroy;

Ok.

> diff --git a/nptl/forward.c b/nptl/forward.c
> index d2352602da..ed5b6c9bb4 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_getschedpolicy,
> -	 (const pthread_attr_t *attr, int *policy), (attr, policy), 0)
>  FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy),
>  	 (attr, policy), 0)
>  

Ok.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 1877248014..8d45952f8e 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_getschedpolicy = __pthread_attr_getschedpolicy,
>      .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy,
>      .ptr_pthread_attr_getscope = __pthread_attr_getscope,
>      .ptr_pthread_attr_setscope = __pthread_attr_setscope,

Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 54f7c22299..84aed530e3 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_getschedpolicy) (const pthread_attr_t *, int *);
>    int (*ptr_pthread_attr_setschedpolicy) (pthread_attr_t *, int);
>    int (*ptr_pthread_attr_getscope) (const pthread_attr_t *, int *);
>    int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 7fb670d91f..d1d7754821 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_getschedpolicy F
>  GLIBC_2.17 pthread_attr_getscope F
>  GLIBC_2.17 pthread_attr_getstack F
>  GLIBC_2.17 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 17d4ef5ce2..5642844e3b 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_getschedpolicy F
>  GLIBC_2.0 pthread_attr_getscope F
>  GLIBC_2.0 pthread_attr_setschedpolicy F
>  GLIBC_2.0 pthread_attr_setscope F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 144ef997fe..ecacce2795 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_getschedpolicy F
>  GLIBC_2.4 pthread_attr_getscope F
>  GLIBC_2.4 pthread_attr_getstack F
>  GLIBC_2.4 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 144ef997fe..ecacce2795 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_getschedpolicy F
>  GLIBC_2.4 pthread_attr_getscope F
>  GLIBC_2.4 pthread_attr_getstack F
>  GLIBC_2.4 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 4edf765af2..0f16a6377b 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_getschedpolicy F
>  GLIBC_2.29 pthread_attr_getscope F
>  GLIBC_2.29 pthread_attr_getstack F
>  GLIBC_2.29 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index cc562f59eb..87201aece7 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_getschedpolicy F
>  GLIBC_2.2 pthread_attr_getscope F
>  GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index b90aa4bb52..8bc06163fb 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_getschedpolicy F
>  GLIBC_2.0 pthread_attr_getscope F
>  GLIBC_2.0 pthread_attr_setschedpolicy F
>  GLIBC_2.0 pthread_attr_setscope F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index 8692ad0780..3e1a27c136 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_getschedpolicy F
>  GLIBC_2.2 pthread_attr_getscope F
>  GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 144ef997fe..ecacce2795 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_getschedpolicy F
>  GLIBC_2.4 pthread_attr_getscope F
>  GLIBC_2.4 pthread_attr_getstack F
>  GLIBC_2.4 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index b90aa4bb52..8bc06163fb 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_getschedpolicy F
>  GLIBC_2.0 pthread_attr_getscope F
>  GLIBC_2.0 pthread_attr_setschedpolicy F
>  GLIBC_2.0 pthread_attr_setscope F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index 40dbd1e7c7..fa983ba8e4 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_getschedpolicy F
>  GLIBC_2.18 pthread_attr_getscope F
>  GLIBC_2.18 pthread_attr_getstack F
>  GLIBC_2.18 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index 40dbd1e7c7..fa983ba8e4 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_getschedpolicy F
>  GLIBC_2.18 pthread_attr_getscope F
>  GLIBC_2.18 pthread_attr_getstack F
>  GLIBC_2.18 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 885e880ddd..75cfef4e76 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_getschedpolicy F
>  GLIBC_2.0 pthread_attr_getscope F
>  GLIBC_2.0 pthread_attr_setschedpolicy F
>  GLIBC_2.0 pthread_attr_setscope F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 885e880ddd..75cfef4e76 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_getschedpolicy F
>  GLIBC_2.0 pthread_attr_getscope F
>  GLIBC_2.0 pthread_attr_setschedpolicy F
>  GLIBC_2.0 pthread_attr_setscope F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index e787d881b5..4f2274f567 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_getschedpolicy F
>  GLIBC_2.21 pthread_attr_getscope F
>  GLIBC_2.21 pthread_attr_getstack F
>  GLIBC_2.21 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 4562654f57..e26440b447 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_getschedpolicy F
>  GLIBC_2.0 pthread_attr_getscope F
>  GLIBC_2.0 pthread_attr_setschedpolicy F
>  GLIBC_2.0 pthread_attr_setscope F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index f6ae27d76b..a2d98b1cc4 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_getschedpolicy F
>  GLIBC_2.3 pthread_attr_getscope F
>  GLIBC_2.3 pthread_attr_getstack F
>  GLIBC_2.3 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index 7fb670d91f..d1d7754821 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_getschedpolicy F
>  GLIBC_2.17 pthread_attr_getscope F
>  GLIBC_2.17 pthread_attr_getstack F
>  GLIBC_2.17 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 1581991fd5..58e845dc0f 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_getschedpolicy F
>  GLIBC_2.27 pthread_attr_getscope F
>  GLIBC_2.27 pthread_attr_getstack F
>  GLIBC_2.27 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index 2d1d9e7758..defd68fee7 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_getschedpolicy F
>  GLIBC_2.0 pthread_attr_getscope F
>  GLIBC_2.0 pthread_attr_setschedpolicy F
>  GLIBC_2.0 pthread_attr_setscope F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 575522bfe6..214241aefd 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_getschedpolicy F
>  GLIBC_2.2 pthread_attr_getscope F
>  GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index cc562f59eb..87201aece7 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_getschedpolicy F
>  GLIBC_2.2 pthread_attr_getscope F
>  GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index cc562f59eb..87201aece7 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_getschedpolicy F
>  GLIBC_2.2 pthread_attr_getscope F
>  GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 17d4ef5ce2..5642844e3b 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_getschedpolicy F
>  GLIBC_2.0 pthread_attr_getscope F
>  GLIBC_2.0 pthread_attr_setschedpolicy F
>  GLIBC_2.0 pthread_attr_setscope F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index 8692ad0780..3e1a27c136 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_getschedpolicy F
>  GLIBC_2.2 pthread_attr_getscope F
>  GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index 91d0b8b14f..214eaaa15a 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_getschedpolicy 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
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 6d8045dbe0..733a412700 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_getschedpolicy F
>  GLIBC_2.16 pthread_attr_getscope F
>  GLIBC_2.16 pthread_attr_getstack F
>  GLIBC_2.16 pthread_attr_getstackaddr F
> 

Ok.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 04/13] nptl: Move pthread_attr_setschedpolicy implementation into libc
  2020-02-11 11:06 ` [PATCH 04/13] nptl: Move pthread_attr_setschedpolicy " Florian Weimer
@ 2020-02-19 17:39   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:39 UTC (permalink / raw)
  To: libc-alpha



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                                                  | 1 -
>  nptl/forward.c                                                 | 3 ---
>  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, 1 insertion(+), 34 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 0eb9cda2e4..1964935fa0 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -46,6 +46,7 @@ routines = \
>    pthread_attr_setdetachstate \
>    pthread_attr_setinheritsched \
>    pthread_attr_setschedparam \
> +  pthread_attr_setschedpolicy \
>    pthread_equal \
>    pthread_self \
>    register-atfork \
> @@ -73,7 +74,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
>  		      pthread_getschedparam pthread_setschedparam \
>  		      pthread_setschedprio \
>  		      pthread_attr_getguardsize pthread_attr_setguardsize \
> -		      pthread_attr_setschedpolicy \
>  		      pthread_attr_getscope pthread_attr_setscope \
>  		      pthread_attr_getstackaddr pthread_attr_setstackaddr \
>  		      pthread_attr_getstacksize pthread_attr_setstacksize \

Ok.

> diff --git a/nptl/Versions b/nptl/Versions
> index d8312e70cc..ca0a7e62a8 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -49,7 +49,6 @@ libpthread {
>  
>      pthread_getschedparam; pthread_setschedparam;
>  
> -    pthread_attr_setschedpolicy;
>      pthread_attr_getscope; pthread_attr_setscope;
>  
>      pthread_mutex_init; pthread_mutex_destroy;

Ok.

> diff --git a/nptl/forward.c b/nptl/forward.c
> index ed5b6c9bb4..7e7fcf2c59 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -56,9 +56,6 @@ name decl								      \
>    FORWARD2 (name, int, decl, params, return defretval)
>  
>  
> -FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy),
> -	 (attr, policy), 0)
> -
>  FORWARD (pthread_attr_getscope,
>  	 (const pthread_attr_t *attr, int *scope), (attr, scope), 0)
>  FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),

Ok.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 8d45952f8e..9741969c4c 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_setschedpolicy = __pthread_attr_setschedpolicy,
>      .ptr_pthread_attr_getscope = __pthread_attr_getscope,
>      .ptr_pthread_attr_setscope = __pthread_attr_setscope,
>      .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,

Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 84aed530e3..927ac5a706 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_setschedpolicy) (pthread_attr_t *, int);
>    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 *);

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index d1d7754821..2f3fd8b2a9 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F
>  GLIBC_2.17 pthread_attr_getstacksize F
>  GLIBC_2.17 pthread_attr_setaffinity_np F
>  GLIBC_2.17 pthread_attr_setguardsize F
> -GLIBC_2.17 pthread_attr_setschedpolicy F
>  GLIBC_2.17 pthread_attr_setscope F
>  GLIBC_2.17 pthread_attr_setstack F
>  GLIBC_2.17 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 5642844e3b..782582e22f 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -45,7 +45,6 @@ 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_setschedpolicy 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 ecacce2795..3802f5d147 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -110,7 +110,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
>  GLIBC_2.4 pthread_attr_getstacksize F
>  GLIBC_2.4 pthread_attr_setaffinity_np F
>  GLIBC_2.4 pthread_attr_setguardsize F
> -GLIBC_2.4 pthread_attr_setschedpolicy F
>  GLIBC_2.4 pthread_attr_setscope F
>  GLIBC_2.4 pthread_attr_setstack F
>  GLIBC_2.4 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index ecacce2795..3802f5d147 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -110,7 +110,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
>  GLIBC_2.4 pthread_attr_getstacksize F
>  GLIBC_2.4 pthread_attr_setaffinity_np F
>  GLIBC_2.4 pthread_attr_setguardsize F
> -GLIBC_2.4 pthread_attr_setschedpolicy F
>  GLIBC_2.4 pthread_attr_setscope F
>  GLIBC_2.4 pthread_attr_setstack F
>  GLIBC_2.4 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 0f16a6377b..5a787cd973 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -83,7 +83,6 @@ GLIBC_2.29 pthread_attr_getstackaddr F
>  GLIBC_2.29 pthread_attr_getstacksize F
>  GLIBC_2.29 pthread_attr_setaffinity_np F
>  GLIBC_2.29 pthread_attr_setguardsize F
> -GLIBC_2.29 pthread_attr_setschedpolicy F
>  GLIBC_2.29 pthread_attr_setscope F
>  GLIBC_2.29 pthread_attr_setstack F
>  GLIBC_2.29 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index 87201aece7..a3ce51c38d 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setschedpolicy F
>  GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index 8bc06163fb..db97003d8b 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -45,7 +45,6 @@ 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_setschedpolicy 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 3e1a27c136..fce31e5cf6 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setschedpolicy F
>  GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index ecacce2795..3802f5d147 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -110,7 +110,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
>  GLIBC_2.4 pthread_attr_getstacksize F
>  GLIBC_2.4 pthread_attr_setaffinity_np F
>  GLIBC_2.4 pthread_attr_setguardsize F
> -GLIBC_2.4 pthread_attr_setschedpolicy F
>  GLIBC_2.4 pthread_attr_setscope F
>  GLIBC_2.4 pthread_attr_setstack F
>  GLIBC_2.4 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index 8bc06163fb..db97003d8b 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -45,7 +45,6 @@ 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_setschedpolicy 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 fa983ba8e4..9bcadbe98b 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F
>  GLIBC_2.18 pthread_attr_getstacksize F
>  GLIBC_2.18 pthread_attr_setaffinity_np F
>  GLIBC_2.18 pthread_attr_setguardsize F
> -GLIBC_2.18 pthread_attr_setschedpolicy F
>  GLIBC_2.18 pthread_attr_setscope F
>  GLIBC_2.18 pthread_attr_setstack F
>  GLIBC_2.18 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index fa983ba8e4..9bcadbe98b 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F
>  GLIBC_2.18 pthread_attr_getstacksize F
>  GLIBC_2.18 pthread_attr_setaffinity_np F
>  GLIBC_2.18 pthread_attr_setguardsize F
> -GLIBC_2.18 pthread_attr_setschedpolicy F
>  GLIBC_2.18 pthread_attr_setscope F
>  GLIBC_2.18 pthread_attr_setstack F
>  GLIBC_2.18 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 75cfef4e76..0f9ed9ce97 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -45,7 +45,6 @@ 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_setschedpolicy 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 75cfef4e76..0f9ed9ce97 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -45,7 +45,6 @@ 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_setschedpolicy 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 4f2274f567..9427133d75 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.21 pthread_attr_getstackaddr F
>  GLIBC_2.21 pthread_attr_getstacksize F
>  GLIBC_2.21 pthread_attr_setaffinity_np F
>  GLIBC_2.21 pthread_attr_setguardsize F
> -GLIBC_2.21 pthread_attr_setschedpolicy F
>  GLIBC_2.21 pthread_attr_setscope F
>  GLIBC_2.21 pthread_attr_setstack F
>  GLIBC_2.21 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index e26440b447..8ef7663e56 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -45,7 +45,6 @@ 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_setschedpolicy 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 a2d98b1cc4..c8374e3ef5 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -96,7 +96,6 @@ GLIBC_2.3 pthread_attr_getstack F
>  GLIBC_2.3 pthread_attr_getstackaddr F
>  GLIBC_2.3 pthread_attr_getstacksize F
>  GLIBC_2.3 pthread_attr_setguardsize F
> -GLIBC_2.3 pthread_attr_setschedpolicy F
>  GLIBC_2.3 pthread_attr_setscope F
>  GLIBC_2.3 pthread_attr_setstack F
>  GLIBC_2.3 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index d1d7754821..2f3fd8b2a9 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F
>  GLIBC_2.17 pthread_attr_getstacksize F
>  GLIBC_2.17 pthread_attr_setaffinity_np F
>  GLIBC_2.17 pthread_attr_setguardsize F
> -GLIBC_2.17 pthread_attr_setschedpolicy F
>  GLIBC_2.17 pthread_attr_setscope F
>  GLIBC_2.17 pthread_attr_setstack F
>  GLIBC_2.17 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 58e845dc0f..21ad813060 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -72,7 +72,6 @@ GLIBC_2.27 pthread_attr_getstackaddr F
>  GLIBC_2.27 pthread_attr_getstacksize F
>  GLIBC_2.27 pthread_attr_setaffinity_np F
>  GLIBC_2.27 pthread_attr_setguardsize F
> -GLIBC_2.27 pthread_attr_setschedpolicy F
>  GLIBC_2.27 pthread_attr_setscope F
>  GLIBC_2.27 pthread_attr_setstack F
>  GLIBC_2.27 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index defd68fee7..2535211071 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -45,7 +45,6 @@ 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_setschedpolicy 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 214241aefd..820b340f5e 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -78,7 +78,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setschedpolicy F
>  GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index 87201aece7..a3ce51c38d 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setschedpolicy F
>  GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index 87201aece7..a3ce51c38d 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setschedpolicy F
>  GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 5642844e3b..782582e22f 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -45,7 +45,6 @@ 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_setschedpolicy 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 3e1a27c136..fce31e5cf6 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -76,7 +76,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setschedpolicy F
>  GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index 214eaaa15a..a5ad630f1e 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -76,7 +76,6 @@ GLIBC_2.2.5 pthread_attr_getstack F
>  GLIBC_2.2.5 pthread_attr_getstackaddr F
>  GLIBC_2.2.5 pthread_attr_getstacksize F
>  GLIBC_2.2.5 pthread_attr_setguardsize F
> -GLIBC_2.2.5 pthread_attr_setschedpolicy F
>  GLIBC_2.2.5 pthread_attr_setscope F
>  GLIBC_2.2.5 pthread_attr_setstack F
>  GLIBC_2.2.5 pthread_attr_setstackaddr F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 733a412700..595ca1a710 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.16 pthread_attr_getstackaddr F
>  GLIBC_2.16 pthread_attr_getstacksize F
>  GLIBC_2.16 pthread_attr_setaffinity_np F
>  GLIBC_2.16 pthread_attr_setguardsize F
> -GLIBC_2.16 pthread_attr_setschedpolicy F
>  GLIBC_2.16 pthread_attr_setscope F
>  GLIBC_2.16 pthread_attr_setstack F
>  GLIBC_2.16 pthread_attr_setstackaddr F
> 

Ok.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 05/13] nptl: Move pthread_attr_getscope implementation into libc
  2020-02-11 11:06 ` [PATCH 05/13] nptl: Move pthread_attr_getscope " Florian Weimer
@ 2020-02-19 17:40   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:40 UTC (permalink / raw)
  To: libc-alpha



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.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 06/13] nptl: Move pthread_attr_setscope implementation into libc
  2020-02-11 11:06 ` [PATCH 06/13] nptl: Move pthread_attr_setscope " Florian Weimer
@ 2020-02-19 17:41   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:41 UTC (permalink / raw)
  To: libc-alpha



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                                                | 4 ----
>  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, 1 insertion(+), 36 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 9a51922e55..04770ea7a5 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -48,6 +48,7 @@ routines = \
>    pthread_attr_setinheritsched \
>    pthread_attr_setschedparam \
>    pthread_attr_setschedpolicy \
> +  pthread_attr_setscope \
>    pthread_equal \
>    pthread_self \
>    register-atfork \

Ok.

> @@ -75,7 +76,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
>  		      pthread_getschedparam pthread_setschedparam \
>  		      pthread_setschedprio \
>  		      pthread_attr_getguardsize pthread_attr_setguardsize \
> -		      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 88b4266287..5b4852a905 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -49,8 +49,6 @@ libpthread {
>  
>      pthread_getschedparam; pthread_setschedparam;
>  
> -    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 43f9eb699f..2076495a8b 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -56,10 +56,6 @@ name decl								      \
>    FORWARD2 (name, int, decl, params, return defretval)
>  
>  
> -FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
> -	 (attr, scope), 0)
> -
> -
>  FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
>  FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
>  

Ok.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 5ccd69341d..2078c561a8 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_setscope = __pthread_attr_setscope,
>      .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
>      .ptr_pthread_condattr_init = __pthread_condattr_init,
>      .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,

Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index a38f9d7fc6..38c2c0595a 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_setscope) (pthread_attr_t *, int);
>    int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
>    int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
>    int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 1c1eefb3fd..1bf8ccf282 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -74,7 +74,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F
>  GLIBC_2.17 pthread_attr_getstacksize F
>  GLIBC_2.17 pthread_attr_setaffinity_np F
>  GLIBC_2.17 pthread_attr_setguardsize F
> -GLIBC_2.17 pthread_attr_setscope F
>  GLIBC_2.17 pthread_attr_setstack F
>  GLIBC_2.17 pthread_attr_setstackaddr F
>  GLIBC_2.17 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 7c971026f3..ac7b1b2ae8 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_setscope F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
>  GLIBC_2.0 pthread_cond_destroy F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 1a3cd91b02..1c4307b259 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
>  GLIBC_2.4 pthread_attr_getstacksize F
>  GLIBC_2.4 pthread_attr_setaffinity_np F
>  GLIBC_2.4 pthread_attr_setguardsize F
> -GLIBC_2.4 pthread_attr_setscope F
>  GLIBC_2.4 pthread_attr_setstack F
>  GLIBC_2.4 pthread_attr_setstackaddr F
>  GLIBC_2.4 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 1a3cd91b02..1c4307b259 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
>  GLIBC_2.4 pthread_attr_getstacksize F
>  GLIBC_2.4 pthread_attr_setaffinity_np F
>  GLIBC_2.4 pthread_attr_setguardsize F
> -GLIBC_2.4 pthread_attr_setscope F
>  GLIBC_2.4 pthread_attr_setstack F
>  GLIBC_2.4 pthread_attr_setstackaddr F
>  GLIBC_2.4 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index e201451825..92ac903a4f 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -82,7 +82,6 @@ GLIBC_2.29 pthread_attr_getstackaddr F
>  GLIBC_2.29 pthread_attr_getstacksize F
>  GLIBC_2.29 pthread_attr_setaffinity_np F
>  GLIBC_2.29 pthread_attr_setguardsize F
> -GLIBC_2.29 pthread_attr_setscope F
>  GLIBC_2.29 pthread_attr_setstack F
>  GLIBC_2.29 pthread_attr_setstackaddr F
>  GLIBC_2.29 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index a0759ebc70..c2dade43aa 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
>  GLIBC_2.2 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index dab30e943d..a60edd4cbc 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_setscope F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
>  GLIBC_2.0 pthread_cond_destroy F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index ccf83eb5c2..8a414d895d 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
>  GLIBC_2.2 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 1a3cd91b02..1c4307b259 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -109,7 +109,6 @@ GLIBC_2.4 pthread_attr_getstackaddr F
>  GLIBC_2.4 pthread_attr_getstacksize F
>  GLIBC_2.4 pthread_attr_setaffinity_np F
>  GLIBC_2.4 pthread_attr_setguardsize F
> -GLIBC_2.4 pthread_attr_setscope F
>  GLIBC_2.4 pthread_attr_setstack F
>  GLIBC_2.4 pthread_attr_setstackaddr F
>  GLIBC_2.4 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index dab30e943d..a60edd4cbc 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_setscope F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
>  GLIBC_2.0 pthread_cond_destroy F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index 185936524a..83352bdc1f 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -74,7 +74,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F
>  GLIBC_2.18 pthread_attr_getstacksize F
>  GLIBC_2.18 pthread_attr_setaffinity_np F
>  GLIBC_2.18 pthread_attr_setguardsize F
> -GLIBC_2.18 pthread_attr_setscope F
>  GLIBC_2.18 pthread_attr_setstack F
>  GLIBC_2.18 pthread_attr_setstackaddr F
>  GLIBC_2.18 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index 185936524a..83352bdc1f 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -74,7 +74,6 @@ GLIBC_2.18 pthread_attr_getstackaddr F
>  GLIBC_2.18 pthread_attr_getstacksize F
>  GLIBC_2.18 pthread_attr_setaffinity_np F
>  GLIBC_2.18 pthread_attr_setguardsize F
> -GLIBC_2.18 pthread_attr_setscope F
>  GLIBC_2.18 pthread_attr_setstack F
>  GLIBC_2.18 pthread_attr_setstackaddr F
>  GLIBC_2.18 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 0a4c17b029..2a19dd6c91 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_setscope F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
>  GLIBC_2.0 pthread_cond_destroy F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 0a4c17b029..2a19dd6c91 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_setscope F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
>  GLIBC_2.0 pthread_cond_destroy F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index edf8c19b72..3c2a84e3ae 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -74,7 +74,6 @@ GLIBC_2.21 pthread_attr_getstackaddr F
>  GLIBC_2.21 pthread_attr_getstacksize F
>  GLIBC_2.21 pthread_attr_setaffinity_np F
>  GLIBC_2.21 pthread_attr_setguardsize F
> -GLIBC_2.21 pthread_attr_setscope F
>  GLIBC_2.21 pthread_attr_setstack F
>  GLIBC_2.21 pthread_attr_setstackaddr F
>  GLIBC_2.21 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 2e80e3be32..cb75099001 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_setscope F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
>  GLIBC_2.0 pthread_cond_destroy F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index 6f12c83064..8cf2fbfc72 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -95,7 +95,6 @@ GLIBC_2.3 pthread_attr_getstack F
>  GLIBC_2.3 pthread_attr_getstackaddr F
>  GLIBC_2.3 pthread_attr_getstacksize F
>  GLIBC_2.3 pthread_attr_setguardsize F
> -GLIBC_2.3 pthread_attr_setscope F
>  GLIBC_2.3 pthread_attr_setstack F
>  GLIBC_2.3 pthread_attr_setstackaddr F
>  GLIBC_2.3 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index 1c1eefb3fd..1bf8ccf282 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -74,7 +74,6 @@ GLIBC_2.17 pthread_attr_getstackaddr F
>  GLIBC_2.17 pthread_attr_getstacksize F
>  GLIBC_2.17 pthread_attr_setaffinity_np F
>  GLIBC_2.17 pthread_attr_setguardsize F
> -GLIBC_2.17 pthread_attr_setscope F
>  GLIBC_2.17 pthread_attr_setstack F
>  GLIBC_2.17 pthread_attr_setstackaddr F
>  GLIBC_2.17 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 60a6f89b6f..86184ee17b 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -71,7 +71,6 @@ GLIBC_2.27 pthread_attr_getstackaddr F
>  GLIBC_2.27 pthread_attr_getstacksize F
>  GLIBC_2.27 pthread_attr_setaffinity_np F
>  GLIBC_2.27 pthread_attr_setguardsize F
> -GLIBC_2.27 pthread_attr_setscope F
>  GLIBC_2.27 pthread_attr_setstack F
>  GLIBC_2.27 pthread_attr_setstackaddr F
>  GLIBC_2.27 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index d37af9c62b..33d54c6c41 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_setscope F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
>  GLIBC_2.0 pthread_cond_destroy F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 964eb077d9..8298c36976 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -77,7 +77,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
>  GLIBC_2.2 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index a0759ebc70..c2dade43aa 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
>  GLIBC_2.2 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index a0759ebc70..c2dade43aa 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
>  GLIBC_2.2 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 7c971026f3..ac7b1b2ae8 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_setscope F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
>  GLIBC_2.0 pthread_cond_destroy F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index ccf83eb5c2..8a414d895d 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.2 pthread_attr_getstack F
>  GLIBC_2.2 pthread_attr_getstackaddr F
>  GLIBC_2.2 pthread_attr_getstacksize F
>  GLIBC_2.2 pthread_attr_setguardsize F
> -GLIBC_2.2 pthread_attr_setscope F
>  GLIBC_2.2 pthread_attr_setstack F
>  GLIBC_2.2 pthread_attr_setstackaddr F
>  GLIBC_2.2 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index 0a4c6b3361..62b52ec607 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -75,7 +75,6 @@ GLIBC_2.2.5 pthread_attr_getstack F
>  GLIBC_2.2.5 pthread_attr_getstackaddr F
>  GLIBC_2.2.5 pthread_attr_getstacksize F
>  GLIBC_2.2.5 pthread_attr_setguardsize F
> -GLIBC_2.2.5 pthread_attr_setscope F
>  GLIBC_2.2.5 pthread_attr_setstack F
>  GLIBC_2.2.5 pthread_attr_setstackaddr F
>  GLIBC_2.2.5 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 35352d5b3f..7597021f4f 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -74,7 +74,6 @@ GLIBC_2.16 pthread_attr_getstackaddr F
>  GLIBC_2.16 pthread_attr_getstacksize F
>  GLIBC_2.16 pthread_attr_setaffinity_np F
>  GLIBC_2.16 pthread_attr_setguardsize F
> -GLIBC_2.16 pthread_attr_setscope F
>  GLIBC_2.16 pthread_attr_setstack F
>  GLIBC_2.16 pthread_attr_setstackaddr F
>  GLIBC_2.16 pthread_attr_setstacksize F
> 

Ok.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 07/13] nptl: Move pthread_condattr_destroy implementation into libc
  2020-02-11 11:06 ` [PATCH 07/13] nptl: Move pthread_condattr_destroy " Florian Weimer
@ 2020-02-19 17:42   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:42 UTC (permalink / raw)
  To: libc-alpha



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                                                 | 1 -
>  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(+), 32 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 04770ea7a5..3102b839eb 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -49,6 +49,7 @@ routines = \
>    pthread_attr_setschedparam \
>    pthread_attr_setschedpolicy \
>    pthread_attr_setscope \
> +  pthread_condattr_destroy \
>    pthread_equal \
>    pthread_self \
>    register-atfork \

Ok.

> @@ -106,7 +107,7 @@ 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_destroy \
> +		      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 5b4852a905..22dc309522 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -58,7 +58,7 @@ libpthread {
>      pthread_cond_wait; pthread_cond_timedwait;
>      pthread_cond_signal; pthread_cond_broadcast;
>  
> -    pthread_condattr_destroy; pthread_condattr_init;
> +    pthread_condattr_init;
>  
>      pthread_cancel; pthread_testcancel;
>      pthread_setcancelstate; pthread_setcanceltype;

Ok.

> diff --git a/nptl/forward.c b/nptl/forward.c
> index 2076495a8b..cf32d8cd3c 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -56,7 +56,6 @@ name decl								      \
>    FORWARD2 (name, int, decl, params, return defretval)
>  
>  
> -FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
>  FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
>  
>  #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)

Ok.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 2078c561a8..d8298d2392 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_destroy = __pthread_condattr_destroy,
>      .ptr_pthread_condattr_init = __pthread_condattr_init,
>      .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
>      .ptr___pthread_cond_destroy = __pthread_cond_destroy,

Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 38c2c0595a..165032b2cc 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_destroy) (pthread_condattr_t *);
>    int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
>    int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
>    int (*ptr___pthread_cond_destroy) (pthread_cond_t *);

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 1bf8ccf282..4727f24896 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.17 pthread_cond_init F
>  GLIBC_2.17 pthread_cond_signal F
>  GLIBC_2.17 pthread_cond_timedwait F
>  GLIBC_2.17 pthread_cond_wait F
> -GLIBC_2.17 pthread_condattr_destroy F
>  GLIBC_2.17 pthread_condattr_getclock F
>  GLIBC_2.17 pthread_condattr_getpshared F
>  GLIBC_2.17 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index ac7b1b2ae8..ff9ad17e83 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_destroy F
>  GLIBC_2.0 pthread_condattr_init F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 1c4307b259..686b98104e 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -126,7 +126,6 @@ GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
>  GLIBC_2.4 pthread_cond_wait F
> -GLIBC_2.4 pthread_condattr_destroy F
>  GLIBC_2.4 pthread_condattr_getclock F
>  GLIBC_2.4 pthread_condattr_getpshared F
>  GLIBC_2.4 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 1c4307b259..686b98104e 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -126,7 +126,6 @@ GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
>  GLIBC_2.4 pthread_cond_wait F
> -GLIBC_2.4 pthread_condattr_destroy F
>  GLIBC_2.4 pthread_condattr_getclock F
>  GLIBC_2.4 pthread_condattr_getpshared F
>  GLIBC_2.4 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 92ac903a4f..67138b844b 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -99,7 +99,6 @@ GLIBC_2.29 pthread_cond_init F
>  GLIBC_2.29 pthread_cond_signal F
>  GLIBC_2.29 pthread_cond_timedwait F
>  GLIBC_2.29 pthread_cond_wait F
> -GLIBC_2.29 pthread_condattr_destroy F
>  GLIBC_2.29 pthread_condattr_getclock F
>  GLIBC_2.29 pthread_condattr_getpshared F
>  GLIBC_2.29 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index c2dade43aa..bdc4e1755a 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
>  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_destroy F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_init F
>  GLIBC_2.2 pthread_condattr_setpshared F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index a60edd4cbc..9ae156fd27 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_destroy F
>  GLIBC_2.0 pthread_condattr_init F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index 8a414d895d..78cb476094 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
>  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_destroy F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_init F
>  GLIBC_2.2 pthread_condattr_setpshared F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 1c4307b259..686b98104e 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -126,7 +126,6 @@ GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
>  GLIBC_2.4 pthread_cond_wait F
> -GLIBC_2.4 pthread_condattr_destroy F
>  GLIBC_2.4 pthread_condattr_getclock F
>  GLIBC_2.4 pthread_condattr_getpshared F
>  GLIBC_2.4 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index a60edd4cbc..9ae156fd27 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_destroy F
>  GLIBC_2.0 pthread_condattr_init F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index 83352bdc1f..b819c21dcb 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.18 pthread_cond_init F
>  GLIBC_2.18 pthread_cond_signal F
>  GLIBC_2.18 pthread_cond_timedwait F
>  GLIBC_2.18 pthread_cond_wait F
> -GLIBC_2.18 pthread_condattr_destroy F
>  GLIBC_2.18 pthread_condattr_getclock F
>  GLIBC_2.18 pthread_condattr_getpshared F
>  GLIBC_2.18 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index 83352bdc1f..b819c21dcb 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.18 pthread_cond_init F
>  GLIBC_2.18 pthread_cond_signal F
>  GLIBC_2.18 pthread_cond_timedwait F
>  GLIBC_2.18 pthread_cond_wait F
> -GLIBC_2.18 pthread_condattr_destroy F
>  GLIBC_2.18 pthread_condattr_getclock F
>  GLIBC_2.18 pthread_condattr_getpshared F
>  GLIBC_2.18 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 2a19dd6c91..404b7f8868 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_destroy F
>  GLIBC_2.0 pthread_condattr_init F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 2a19dd6c91..404b7f8868 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_destroy F
>  GLIBC_2.0 pthread_condattr_init F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 3c2a84e3ae..8710edf723 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.21 pthread_cond_init F
>  GLIBC_2.21 pthread_cond_signal F
>  GLIBC_2.21 pthread_cond_timedwait F
>  GLIBC_2.21 pthread_cond_wait F
> -GLIBC_2.21 pthread_condattr_destroy F
>  GLIBC_2.21 pthread_condattr_getclock F
>  GLIBC_2.21 pthread_condattr_getpshared F
>  GLIBC_2.21 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index cb75099001..b42ad93959 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_destroy F
>  GLIBC_2.0 pthread_condattr_init F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index 8cf2fbfc72..86430a78ac 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -111,7 +111,6 @@ GLIBC_2.3 pthread_cond_init F
>  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_destroy F
>  GLIBC_2.3 pthread_condattr_getpshared F
>  GLIBC_2.3 pthread_condattr_init F
>  GLIBC_2.3 pthread_condattr_setpshared F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index 1bf8ccf282..4727f24896 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.17 pthread_cond_init F
>  GLIBC_2.17 pthread_cond_signal F
>  GLIBC_2.17 pthread_cond_timedwait F
>  GLIBC_2.17 pthread_cond_wait F
> -GLIBC_2.17 pthread_condattr_destroy F
>  GLIBC_2.17 pthread_condattr_getclock F
>  GLIBC_2.17 pthread_condattr_getpshared F
>  GLIBC_2.17 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 86184ee17b..cb3a6a8344 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -88,7 +88,6 @@ GLIBC_2.27 pthread_cond_init F
>  GLIBC_2.27 pthread_cond_signal F
>  GLIBC_2.27 pthread_cond_timedwait F
>  GLIBC_2.27 pthread_cond_wait F
> -GLIBC_2.27 pthread_condattr_destroy F
>  GLIBC_2.27 pthread_condattr_getclock F
>  GLIBC_2.27 pthread_condattr_getpshared F
>  GLIBC_2.27 pthread_condattr_init F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index 33d54c6c41..6700046b59 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_destroy F
>  GLIBC_2.0 pthread_condattr_init F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 8298c36976..b9a663c25d 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -93,7 +93,6 @@ GLIBC_2.2 pthread_cond_init F
>  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_destroy F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_init F
>  GLIBC_2.2 pthread_condattr_setpshared F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index c2dade43aa..bdc4e1755a 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
>  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_destroy F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_init F
>  GLIBC_2.2 pthread_condattr_setpshared F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index c2dade43aa..bdc4e1755a 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
>  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_destroy F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_init F
>  GLIBC_2.2 pthread_condattr_setpshared F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index ac7b1b2ae8..ff9ad17e83 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_destroy F
>  GLIBC_2.0 pthread_condattr_init F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index 8a414d895d..78cb476094 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.2 pthread_cond_init F
>  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_destroy F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_init F
>  GLIBC_2.2 pthread_condattr_setpshared F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index 62b52ec607..12b8d05921 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.2.5 pthread_cond_init F
>  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_destroy 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
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 7597021f4f..451a473a58 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -91,7 +91,6 @@ GLIBC_2.16 pthread_cond_init F
>  GLIBC_2.16 pthread_cond_signal F
>  GLIBC_2.16 pthread_cond_timedwait F
>  GLIBC_2.16 pthread_cond_wait F
> -GLIBC_2.16 pthread_condattr_destroy F
>  GLIBC_2.16 pthread_condattr_getclock F
>  GLIBC_2.16 pthread_condattr_getpshared F
>  GLIBC_2.16 pthread_condattr_init F
> 

Ok.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 08/13] nptl: Move pthread_condattr_init implementation into libc
  2020-02-11 11:06 ` [PATCH 08/13] nptl: Move pthread_condattr_init " Florian Weimer
@ 2020-02-19 17:42   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:42 UTC (permalink / raw)
  To: libc-alpha



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.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 09/13] nptl: Move pthread_cond_destroy implementation into libc
  2020-02-11 11:06 ` [PATCH 09/13] nptl: Move pthread_cond_destroy " Florian Weimer
@ 2020-02-19 17:48   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:48 UTC (permalink / raw)
  To: libc-alpha



On 11/02/2020 08:06, Florian Weimer wrote:
> It is necessary to export __pthread_cond_destroy from libc because
> the C11 condition variable needs it and is still left in libpthread.

I think moving C11 threads to libc.so should be as simple as this patchset
as well.

> 
> 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                                          |  6 ++++--
>  nptl/Versions                                          |  6 ++++--
>  nptl/forward.c                                         | 10 ----------
>  nptl/nptl-init.c                                       |  2 --
>  nptl/old_pthread_cond_destroy.c                        |  4 ++--
>  nptl/pthreadP.h                                        |  1 +
>  nptl/pthread_cond_destroy.c                            |  3 ++-
>  sysdeps/nptl/pthread-functions.h                       |  2 --
>  sysdeps/unix/sysv/linux/aarch64/libpthread.abilist     |  1 -
>  sysdeps/unix/sysv/linux/alpha/libpthread.abilist       |  2 --
>  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        |  2 --
>  sysdeps/unix/sysv/linux/i386/libpthread.abilist        |  2 --
>  sysdeps/unix/sysv/linux/ia64/libpthread.abilist        |  2 --
>  .../unix/sysv/linux/m68k/coldfire/libpthread.abilist   |  1 -
>  sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist |  2 --
>  .../unix/sysv/linux/microblaze/be/libpthread.abilist   |  1 -
>  .../unix/sysv/linux/microblaze/le/libpthread.abilist   |  1 -
>  sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist |  2 --
>  sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist |  2 --
>  sysdeps/unix/sysv/linux/nios2/libpthread.abilist       |  1 -
>  .../sysv/linux/powerpc/powerpc32/libpthread.abilist    |  2 --
>  .../sysv/linux/powerpc/powerpc64/be/libpthread.abilist |  2 --
>  .../sysv/linux/powerpc/powerpc64/le/libpthread.abilist |  1 -
>  sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist  |  1 -
>  .../unix/sysv/linux/s390/s390-32/libpthread.abilist    |  2 --
>  .../unix/sysv/linux/s390/s390-64/libpthread.abilist    |  2 --
>  sysdeps/unix/sysv/linux/sh/be/libpthread.abilist       |  2 --
>  sysdeps/unix/sysv/linux/sh/le/libpthread.abilist       |  2 --
>  .../unix/sysv/linux/sparc/sparc32/libpthread.abilist   |  2 --
>  .../unix/sysv/linux/sparc/sparc64/libpthread.abilist   |  2 --
>  sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist   |  2 --
>  sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist  |  1 -
>  35 files changed, 13 insertions(+), 64 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index b14a64e693..19f11a5c9a 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -36,6 +36,7 @@ routines = \
>    libc-lowlevellock \
>    libc_multiple_threads \
>    libc_pthread_init \
> +  old_pthread_cond_destroy \
>    pthread_atfork \
>    pthread_attr_destroy \
>    pthread_attr_getdetachstate \
> @@ -49,6 +50,7 @@ routines = \
>    pthread_attr_setschedparam \
>    pthread_attr_setschedpolicy \
>    pthread_attr_setscope \
> +  pthread_cond_destroy \
>    pthread_condattr_destroy \
>    pthread_condattr_init \
>    pthread_equal \

Ok.

> @@ -102,10 +104,10 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
>  		      pthread_rwlockattr_setpshared \
>  		      pthread_rwlockattr_getkind_np \
>  		      pthread_rwlockattr_setkind_np \
> -		      pthread_cond_init pthread_cond_destroy \
> +		      pthread_cond_init \
>  		      pthread_cond_wait \
>  		      pthread_cond_signal pthread_cond_broadcast \
> -		      old_pthread_cond_init old_pthread_cond_destroy \
> +		      old_pthread_cond_init \
>  		      old_pthread_cond_wait old_pthread_cond_timedwait \
>  		      old_pthread_cond_signal old_pthread_cond_broadcast \
>  		      pthread_condattr_getpshared pthread_condattr_setpshared \

Ok.

> diff --git a/nptl/Versions b/nptl/Versions
> index bc1bad0562..4dbe68d76c 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -39,6 +39,8 @@ libc {
>      __libc_pthread_init;
>      __libc_current_sigrtmin_private; __libc_current_sigrtmax_private;
>      __libc_allocate_rtsig_private;
> +    # Used by the C11 threads implementation.
> +    __pthread_cond_destroy;
>    }
>  }
>  

Ok.

> @@ -54,7 +56,7 @@ libpthread {
>  
>      pthread_mutexattr_init; pthread_mutexattr_destroy;
>  
> -    pthread_cond_init; pthread_cond_destroy;
> +    pthread_cond_init;
>      pthread_cond_wait; pthread_cond_timedwait;
>      pthread_cond_signal; pthread_cond_broadcast;
>  

Ok.

> @@ -193,7 +195,7 @@ libpthread {
>  
>    GLIBC_2.3.2 {
>      # Changed pthread_cond_t.
> -    pthread_cond_init; pthread_cond_destroy;
> +    pthread_cond_init;
>      pthread_cond_wait; pthread_cond_timedwait;
>      pthread_cond_signal; pthread_cond_broadcast;
>    }

Ok.

> diff --git a/nptl/forward.c b/nptl/forward.c
> index 9383ada753..3e1734854e 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -66,16 +66,6 @@ FORWARD (__pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
>  versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast,
>  		  GLIBC_2_3_2);
>  
> -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
> -FORWARD2 (__pthread_cond_destroy_2_0, int attribute_compat_text_section,
> -	  (pthread_cond_2_0_t *cond), (cond), return 0)
> -compat_symbol (libc, __pthread_cond_destroy_2_0, pthread_cond_destroy,
> -	       GLIBC_2_0);
> -#endif
> -FORWARD (__pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0)
> -versioned_symbol (libc, __pthread_cond_destroy, pthread_cond_destroy,
> -		  GLIBC_2_3_2);
> -
>  #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
>  FORWARD2 (__pthread_cond_init_2_0, int attribute_compat_text_section,
>  	  (pthread_cond_2_0_t *cond, const pthread_condattr_t *cond_attr),

Ok.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 563ab7b1e8..9e17a2be6d 100644
> --- a/nptl/nptl-init.c
> +++ b/nptl/nptl-init.c
> @@ -73,14 +73,12 @@ void __nptl_set_robust (struct pthread *);
>  static const struct pthread_functions pthread_functions =
>    {
>      .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
> -    .ptr___pthread_cond_destroy = __pthread_cond_destroy,
>      .ptr___pthread_cond_init = __pthread_cond_init,
>      .ptr___pthread_cond_signal = __pthread_cond_signal,
>      .ptr___pthread_cond_wait = __pthread_cond_wait,
>      .ptr___pthread_cond_timedwait = __pthread_cond_timedwait,
>  # if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
>      .ptr___pthread_cond_broadcast_2_0 = __pthread_cond_broadcast_2_0,
> -    .ptr___pthread_cond_destroy_2_0 = __pthread_cond_destroy_2_0,
>      .ptr___pthread_cond_init_2_0 = __pthread_cond_init_2_0,
>      .ptr___pthread_cond_signal_2_0 = __pthread_cond_signal_2_0,
>      .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,

Ok.

> diff --git a/nptl/old_pthread_cond_destroy.c b/nptl/old_pthread_cond_destroy.c
> index 46dad05d49..4996deceb8 100644
> --- a/nptl/old_pthread_cond_destroy.c
> +++ b/nptl/old_pthread_cond_destroy.c
> @@ -21,7 +21,7 @@
>  #include <shlib-compat.h>
>  
>  
> -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
> +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
>  int
>  __pthread_cond_destroy_2_0 (pthread_cond_2_0_t *cond)
>  {
> @@ -30,6 +30,6 @@ __pthread_cond_destroy_2_0 (pthread_cond_2_0_t *cond)
>  
>    return 0;
>  }
> -compat_symbol (libpthread, __pthread_cond_destroy_2_0, pthread_cond_destroy,
> +compat_symbol (libc, __pthread_cond_destroy_2_0, pthread_cond_destroy,
>  	       GLIBC_2_0);
>  #endif

Ok.

> diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
> index 7e0ab8ef42..f348c75d90 100644
> --- a/nptl/pthreadP.h
> +++ b/nptl/pthreadP.h
> @@ -442,6 +442,7 @@ extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
>  extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
>  extern int __pthread_cond_broadcast (pthread_cond_t *cond);
>  extern int __pthread_cond_destroy (pthread_cond_t *cond);
> +libc_hidden_proto (__pthread_cond_destroy)
>  extern int __pthread_cond_init (pthread_cond_t *cond,
>  				const pthread_condattr_t *cond_attr);
>  extern int __pthread_cond_signal (pthread_cond_t *cond);

Ok.

> diff --git a/nptl/pthread_cond_destroy.c b/nptl/pthread_cond_destroy.c
> index 168546574b..31034905d1 100644
> --- a/nptl/pthread_cond_destroy.c
> +++ b/nptl/pthread_cond_destroy.c
> @@ -58,5 +58,6 @@ __pthread_cond_destroy (pthread_cond_t *cond)
>    /* The memory the condvar occupies can now be reused.  */
>    return 0;
>  }
> -versioned_symbol (libpthread, __pthread_cond_destroy,
> +libc_hidden_def (__pthread_cond_destroy)
> +versioned_symbol (libc, __pthread_cond_destroy,
>  		  pthread_cond_destroy, GLIBC_2_3_2);

Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 25c05bf4d8..ceb1cc631d 100644
> --- a/sysdeps/nptl/pthread-functions.h
> +++ b/sysdeps/nptl/pthread-functions.h
> @@ -31,7 +31,6 @@ struct xid_command;
>  struct pthread_functions
>  {
>    int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
> -  int (*ptr___pthread_cond_destroy) (pthread_cond_t *);
>    int (*ptr___pthread_cond_init) (pthread_cond_t *,
>  				  const pthread_condattr_t *);
>    int (*ptr___pthread_cond_signal) (pthread_cond_t *);
> @@ -39,7 +38,6 @@ struct pthread_functions
>    int (*ptr___pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
>  				       const struct timespec *);
>    int (*ptr___pthread_cond_broadcast_2_0) (pthread_cond_2_0_t *);
> -  int (*ptr___pthread_cond_destroy_2_0) (pthread_cond_2_0_t *);
>    int (*ptr___pthread_cond_init_2_0) (pthread_cond_2_0_t *,
>  				      const pthread_condattr_t *);
>    int (*ptr___pthread_cond_signal_2_0) (pthread_cond_2_0_t *);

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index d5b247d1bd..6237b22222 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.17 pthread_barrierattr_init F
>  GLIBC_2.17 pthread_barrierattr_setpshared F
>  GLIBC_2.17 pthread_cancel F
>  GLIBC_2.17 pthread_cond_broadcast F
> -GLIBC_2.17 pthread_cond_destroy F
>  GLIBC_2.17 pthread_cond_init F
>  GLIBC_2.17 pthread_cond_signal F
>  GLIBC_2.17 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 391be30e38..be6e5dcd3d 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_destroy F
>  GLIBC_2.0 pthread_cond_init F
>  GLIBC_2.0 pthread_cond_signal F
>  GLIBC_2.0 pthread_cond_timedwait F
> @@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 862b5d30be..3016511f3e 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
>  GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_destroy F
>  GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 862b5d30be..3016511f3e 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
>  GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_destroy F
>  GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 04559140c9..e33492d3d2 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -94,7 +94,6 @@ GLIBC_2.29 pthread_barrierattr_init F
>  GLIBC_2.29 pthread_barrierattr_setpshared F
>  GLIBC_2.29 pthread_cancel F
>  GLIBC_2.29 pthread_cond_broadcast F
> -GLIBC_2.29 pthread_cond_destroy F
>  GLIBC_2.29 pthread_cond_init F
>  GLIBC_2.29 pthread_cond_signal F
>  GLIBC_2.29 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index aa0c6d1da0..1ac88709aa 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_destroy F
>  GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
> @@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index b815b155b5..d9e2a3bf91 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_destroy F
>  GLIBC_2.0 pthread_cond_init F
>  GLIBC_2.0 pthread_cond_signal F
>  GLIBC_2.0 pthread_cond_timedwait F
> @@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index 283e0e6f9d..a2be53b8c5 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_destroy F
>  GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
> @@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 862b5d30be..3016511f3e 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
>  GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_destroy F
>  GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index b815b155b5..d9e2a3bf91 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_destroy F
>  GLIBC_2.0 pthread_cond_init F
>  GLIBC_2.0 pthread_cond_signal F
>  GLIBC_2.0 pthread_cond_timedwait F
> @@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index e1ffc40cd9..30fd457419 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.18 pthread_barrierattr_init F
>  GLIBC_2.18 pthread_barrierattr_setpshared F
>  GLIBC_2.18 pthread_cancel F
>  GLIBC_2.18 pthread_cond_broadcast F
> -GLIBC_2.18 pthread_cond_destroy F
>  GLIBC_2.18 pthread_cond_init F
>  GLIBC_2.18 pthread_cond_signal F
>  GLIBC_2.18 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index e1ffc40cd9..30fd457419 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.18 pthread_barrierattr_init F
>  GLIBC_2.18 pthread_barrierattr_setpshared F
>  GLIBC_2.18 pthread_cancel F
>  GLIBC_2.18 pthread_cond_broadcast F
> -GLIBC_2.18 pthread_cond_destroy F
>  GLIBC_2.18 pthread_cond_init F
>  GLIBC_2.18 pthread_cond_signal F
>  GLIBC_2.18 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 70169b45b4..2d5730fc8f 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_destroy F
>  GLIBC_2.0 pthread_cond_init F
>  GLIBC_2.0 pthread_cond_signal F
>  GLIBC_2.0 pthread_cond_timedwait F
> @@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 70169b45b4..2d5730fc8f 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_destroy F
>  GLIBC_2.0 pthread_cond_init F
>  GLIBC_2.0 pthread_cond_signal F
>  GLIBC_2.0 pthread_cond_timedwait F
> @@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 6baae4309c..94f6396182 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.21 pthread_barrierattr_init F
>  GLIBC_2.21 pthread_barrierattr_setpshared F
>  GLIBC_2.21 pthread_cancel F
>  GLIBC_2.21 pthread_cond_broadcast F
> -GLIBC_2.21 pthread_cond_destroy F
>  GLIBC_2.21 pthread_cond_init F
>  GLIBC_2.21 pthread_cond_signal F
>  GLIBC_2.21 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 0dd3739a03..62e8dba625 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_destroy F
>  GLIBC_2.0 pthread_cond_init F
>  GLIBC_2.0 pthread_cond_signal F
>  GLIBC_2.0 pthread_cond_timedwait F
> @@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index 8d4fa60131..ada466504c 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -106,7 +106,6 @@ GLIBC_2.3 pthread_barrierattr_init F
>  GLIBC_2.3 pthread_barrierattr_setpshared F
>  GLIBC_2.3 pthread_cancel F
>  GLIBC_2.3 pthread_cond_broadcast F
> -GLIBC_2.3 pthread_cond_destroy F
>  GLIBC_2.3 pthread_cond_init F
>  GLIBC_2.3 pthread_cond_signal F
>  GLIBC_2.3 pthread_cond_timedwait F
> @@ -196,7 +195,6 @@ GLIBC_2.3 system F
>  GLIBC_2.3 tcdrain F
>  GLIBC_2.3 write F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index d5b247d1bd..6237b22222 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.17 pthread_barrierattr_init F
>  GLIBC_2.17 pthread_barrierattr_setpshared F
>  GLIBC_2.17 pthread_cancel F
>  GLIBC_2.17 pthread_cond_broadcast F
> -GLIBC_2.17 pthread_cond_destroy F
>  GLIBC_2.17 pthread_cond_init F
>  GLIBC_2.17 pthread_cond_signal F
>  GLIBC_2.17 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index e3391617d6..30a1e15e90 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -83,7 +83,6 @@ GLIBC_2.27 pthread_barrierattr_init F
>  GLIBC_2.27 pthread_barrierattr_setpshared F
>  GLIBC_2.27 pthread_cancel F
>  GLIBC_2.27 pthread_cond_broadcast F
> -GLIBC_2.27 pthread_cond_destroy F
>  GLIBC_2.27 pthread_cond_init F
>  GLIBC_2.27 pthread_cond_signal F
>  GLIBC_2.27 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index ff80259a92..a9a8c7630e 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_destroy F
>  GLIBC_2.0 pthread_cond_init F
>  GLIBC_2.0 pthread_cond_signal F
>  GLIBC_2.0 pthread_cond_timedwait F
> @@ -208,7 +207,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 02d7c0409a..7052913b40 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -88,7 +88,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_destroy F
>  GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
> @@ -200,7 +199,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index aa0c6d1da0..1ac88709aa 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_destroy F
>  GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
> @@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index aa0c6d1da0..1ac88709aa 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_destroy F
>  GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
> @@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 391be30e38..be6e5dcd3d 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_destroy F
>  GLIBC_2.0 pthread_cond_init F
>  GLIBC_2.0 pthread_cond_signal F
>  GLIBC_2.0 pthread_cond_timedwait F
> @@ -206,7 +205,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index 283e0e6f9d..a2be53b8c5 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_destroy F
>  GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
> @@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index 35835c89d9..90780c92d4 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2.5 pthread_barrierattr_init F
>  GLIBC_2.2.5 pthread_barrierattr_setpshared F
>  GLIBC_2.2.5 pthread_cancel F
>  GLIBC_2.2.5 pthread_cond_broadcast F
> -GLIBC_2.2.5 pthread_cond_destroy F
>  GLIBC_2.2.5 pthread_cond_init F
>  GLIBC_2.2.5 pthread_cond_signal F
>  GLIBC_2.2.5 pthread_cond_timedwait F
> @@ -198,7 +197,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_destroy F
>  GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 4b27550ad0..b24b7b637e 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.16 pthread_barrierattr_init F
>  GLIBC_2.16 pthread_barrierattr_setpshared F
>  GLIBC_2.16 pthread_cancel F
>  GLIBC_2.16 pthread_cond_broadcast F
> -GLIBC_2.16 pthread_cond_destroy F
>  GLIBC_2.16 pthread_cond_init F
>  GLIBC_2.16 pthread_cond_signal F
>  GLIBC_2.16 pthread_cond_timedwait F
> 

Ok.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 10/13] nptl: Move pthread_cond_init implementation into libc
  2020-02-11 11:06 ` [PATCH 10/13] nptl: Move pthread_cond_init " Florian Weimer
@ 2020-02-19 17:50   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:50 UTC (permalink / raw)
  To: libc-alpha



On 11/02/2020 08:06, Florian Weimer wrote:
> It is necessary to export __pthread_cond_init from libc because
> the C11 condition variable needs it and is still left in libpthread.
> 
> 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                                         |  4 ++--
>  nptl/Versions                                         |  3 +--
>  nptl/forward.c                                        | 11 -----------
>  nptl/nptl-init.c                                      |  2 --
>  nptl/old_pthread_cond_init.c                          |  4 ++--
>  nptl/pthreadP.h                                       |  1 +
>  nptl/pthread_cond_init.c                              |  3 ++-
>  sysdeps/nptl/pthread-functions.h                      |  4 ----
>  sysdeps/unix/sysv/linux/aarch64/libpthread.abilist    |  1 -
>  sysdeps/unix/sysv/linux/alpha/libpthread.abilist      |  2 --
>  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       |  2 --
>  sysdeps/unix/sysv/linux/i386/libpthread.abilist       |  2 --
>  sysdeps/unix/sysv/linux/ia64/libpthread.abilist       |  2 --
>  .../unix/sysv/linux/m68k/coldfire/libpthread.abilist  |  1 -
>  .../unix/sysv/linux/m68k/m680x0/libpthread.abilist    |  2 --
>  .../unix/sysv/linux/microblaze/be/libpthread.abilist  |  1 -
>  .../unix/sysv/linux/microblaze/le/libpthread.abilist  |  1 -
>  .../unix/sysv/linux/mips/mips32/libpthread.abilist    |  2 --
>  .../unix/sysv/linux/mips/mips64/libpthread.abilist    |  2 --
>  sysdeps/unix/sysv/linux/nios2/libpthread.abilist      |  1 -
>  .../sysv/linux/powerpc/powerpc32/libpthread.abilist   |  2 --
>  .../linux/powerpc/powerpc64/be/libpthread.abilist     |  2 --
>  .../linux/powerpc/powerpc64/le/libpthread.abilist     |  1 -
>  sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist |  1 -
>  .../unix/sysv/linux/s390/s390-32/libpthread.abilist   |  2 --
>  .../unix/sysv/linux/s390/s390-64/libpthread.abilist   |  2 --
>  sysdeps/unix/sysv/linux/sh/be/libpthread.abilist      |  2 --
>  sysdeps/unix/sysv/linux/sh/le/libpthread.abilist      |  2 --
>  .../unix/sysv/linux/sparc/sparc32/libpthread.abilist  |  2 --
>  .../unix/sysv/linux/sparc/sparc64/libpthread.abilist  |  2 --
>  sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist  |  2 --
>  sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist |  1 -
>  35 files changed, 8 insertions(+), 67 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 19f11a5c9a..eb87ecb1b3 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -37,6 +37,7 @@ routines = \
>    libc_multiple_threads \
>    libc_pthread_init \
>    old_pthread_cond_destroy \
> +  old_pthread_cond_init \
>    pthread_atfork \
>    pthread_attr_destroy \
>    pthread_attr_getdetachstate \
> @@ -51,6 +52,7 @@ routines = \
>    pthread_attr_setschedpolicy \
>    pthread_attr_setscope \
>    pthread_cond_destroy \
> +  pthread_cond_init \
>    pthread_condattr_destroy \
>    pthread_condattr_init \
>    pthread_equal \

Ok.

> @@ -104,10 +106,8 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
>  		      pthread_rwlockattr_setpshared \
>  		      pthread_rwlockattr_getkind_np \
>  		      pthread_rwlockattr_setkind_np \
> -		      pthread_cond_init \
>  		      pthread_cond_wait \
>  		      pthread_cond_signal pthread_cond_broadcast \
> -		      old_pthread_cond_init \
>  		      old_pthread_cond_wait old_pthread_cond_timedwait \
>  		      old_pthread_cond_signal old_pthread_cond_broadcast \
>  		      pthread_condattr_getpshared pthread_condattr_setpshared \

Ok.

> diff --git a/nptl/Versions b/nptl/Versions
> index 4dbe68d76c..914404c45e 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -40,7 +40,7 @@ libc {
>      __libc_current_sigrtmin_private; __libc_current_sigrtmax_private;
>      __libc_allocate_rtsig_private;
>      # Used by the C11 threads implementation.
> -    __pthread_cond_destroy;
> +    __pthread_cond_destroy; __pthread_cond_init;
>    }
>  }
>  
> @@ -56,7 +56,6 @@ libpthread {
>  
>      pthread_mutexattr_init; pthread_mutexattr_destroy;
>  
> -    pthread_cond_init;
>      pthread_cond_wait; pthread_cond_timedwait;
>      pthread_cond_signal; pthread_cond_broadcast;
>  

Ok.

> diff --git a/nptl/forward.c b/nptl/forward.c
> index 3e1734854e..6ee4b92d52 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -66,17 +66,6 @@ FORWARD (__pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
>  versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast,
>  		  GLIBC_2_3_2);
>  
> -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
> -FORWARD2 (__pthread_cond_init_2_0, int attribute_compat_text_section,
> -	  (pthread_cond_2_0_t *cond, const pthread_condattr_t *cond_attr),
> -	  (cond, cond_attr), return 0)
> -compat_symbol (libc, __pthread_cond_init_2_0, pthread_cond_init, GLIBC_2_0);
> -#endif
> -FORWARD (__pthread_cond_init,
> -	 (pthread_cond_t *cond, const pthread_condattr_t *cond_attr),
> -	 (cond, cond_attr), 0)
> -versioned_symbol (libc, __pthread_cond_init, pthread_cond_init, GLIBC_2_3_2);
> -
>  #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
>  FORWARD2 (__pthread_cond_signal_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 9e17a2be6d..56a4848d6e 100644
> --- a/nptl/nptl-init.c
> +++ b/nptl/nptl-init.c
> @@ -73,13 +73,11 @@ void __nptl_set_robust (struct pthread *);
>  static const struct pthread_functions pthread_functions =
>    {
>      .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
> -    .ptr___pthread_cond_init = __pthread_cond_init,
>      .ptr___pthread_cond_signal = __pthread_cond_signal,
>      .ptr___pthread_cond_wait = __pthread_cond_wait,
>      .ptr___pthread_cond_timedwait = __pthread_cond_timedwait,
>  # if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
>      .ptr___pthread_cond_broadcast_2_0 = __pthread_cond_broadcast_2_0,
> -    .ptr___pthread_cond_init_2_0 = __pthread_cond_init_2_0,
>      .ptr___pthread_cond_signal_2_0 = __pthread_cond_signal_2_0,
>      .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
>      .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,

Ok.

> diff --git a/nptl/old_pthread_cond_init.c b/nptl/old_pthread_cond_init.c
> index df0f1fd7e8..d71aa802b8 100644
> --- a/nptl/old_pthread_cond_init.c
> +++ b/nptl/old_pthread_cond_init.c
> @@ -21,7 +21,7 @@
>  #include <shlib-compat.h>
>  
>  
> -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
> +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
>  int
>  __pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
>  			 const pthread_condattr_t *cond_attr)

Ok.

> @@ -40,6 +40,6 @@ __pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
>  
>    return 0;
>  }
> -compat_symbol (libpthread, __pthread_cond_init_2_0, pthread_cond_init,
> +compat_symbol (libc, __pthread_cond_init_2_0, pthread_cond_init,
>  	       GLIBC_2_0);
>  #endif

Ok.

> diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
> index f348c75d90..edf381d820 100644
> --- a/nptl/pthreadP.h
> +++ b/nptl/pthreadP.h
> @@ -445,6 +445,7 @@ extern int __pthread_cond_destroy (pthread_cond_t *cond);
>  libc_hidden_proto (__pthread_cond_destroy)
>  extern int __pthread_cond_init (pthread_cond_t *cond,
>  				const pthread_condattr_t *cond_attr);
> +libc_hidden_proto (__pthread_cond_init)
>  extern int __pthread_cond_signal (pthread_cond_t *cond);
>  extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
>  extern int __pthread_cond_timedwait (pthread_cond_t *cond,

Ok.

> diff --git a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c
> index 1dce2ed46e..595b1b3528 100644
> --- a/nptl/pthread_cond_init.c
> +++ b/nptl/pthread_cond_init.c
> @@ -49,5 +49,6 @@ __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr)
>  
>    return 0;
>  }
> -versioned_symbol (libpthread, __pthread_cond_init,
> +libc_hidden_def (__pthread_cond_init)
> +versioned_symbol (libc, __pthread_cond_init,
>  		  pthread_cond_init, GLIBC_2_3_2);

Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index ceb1cc631d..9e12cf7f20 100644
> --- a/sysdeps/nptl/pthread-functions.h
> +++ b/sysdeps/nptl/pthread-functions.h
> @@ -31,15 +31,11 @@ struct xid_command;
>  struct pthread_functions
>  {
>    int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
> -  int (*ptr___pthread_cond_init) (pthread_cond_t *,
> -				  const pthread_condattr_t *);
>    int (*ptr___pthread_cond_signal) (pthread_cond_t *);
>    int (*ptr___pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
>    int (*ptr___pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
>  				       const struct timespec *);
>    int (*ptr___pthread_cond_broadcast_2_0) (pthread_cond_2_0_t *);
> -  int (*ptr___pthread_cond_init_2_0) (pthread_cond_2_0_t *,
> -				      const pthread_condattr_t *);
>    int (*ptr___pthread_cond_signal_2_0) (pthread_cond_2_0_t *);
>    int (*ptr___pthread_cond_wait_2_0) (pthread_cond_2_0_t *, pthread_mutex_t *);
>    int (*ptr___pthread_cond_timedwait_2_0) (pthread_cond_2_0_t *,

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 6237b22222..ca00e45ff6 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.17 pthread_barrierattr_init F
>  GLIBC_2.17 pthread_barrierattr_setpshared F
>  GLIBC_2.17 pthread_cancel F
>  GLIBC_2.17 pthread_cond_broadcast F
> -GLIBC_2.17 pthread_cond_init F
>  GLIBC_2.17 pthread_cond_signal F
>  GLIBC_2.17 pthread_cond_timedwait F
>  GLIBC_2.17 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index be6e5dcd3d..7a678786d7 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -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
> @@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 3016511f3e..cc36449cfd 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
>  GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
>  GLIBC_2.4 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 3016511f3e..cc36449cfd 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
>  GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
>  GLIBC_2.4 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index e33492d3d2..eacb6a19f7 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -94,7 +94,6 @@ GLIBC_2.29 pthread_barrierattr_init F
>  GLIBC_2.29 pthread_barrierattr_setpshared F
>  GLIBC_2.29 pthread_cancel F
>  GLIBC_2.29 pthread_cond_broadcast F
> -GLIBC_2.29 pthread_cond_init F
>  GLIBC_2.29 pthread_cond_signal F
>  GLIBC_2.29 pthread_cond_timedwait F
>  GLIBC_2.29 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index 1ac88709aa..251d48e7e3 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
>  GLIBC_2.2 pthread_cond_wait F
> @@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index d9e2a3bf91..51a734aafc 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -46,7 +46,6 @@ GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -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
> @@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index a2be53b8c5..ea8f277428 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
>  GLIBC_2.2 pthread_cond_wait F
> @@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 3016511f3e..cc36449cfd 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -121,7 +121,6 @@ GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
>  GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_init F
>  GLIBC_2.4 pthread_cond_signal F
>  GLIBC_2.4 pthread_cond_timedwait F
>  GLIBC_2.4 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index d9e2a3bf91..51a734aafc 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -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
> @@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index 30fd457419..f431bf8a5d 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.18 pthread_barrierattr_init F
>  GLIBC_2.18 pthread_barrierattr_setpshared F
>  GLIBC_2.18 pthread_cancel F
>  GLIBC_2.18 pthread_cond_broadcast F
> -GLIBC_2.18 pthread_cond_init F
>  GLIBC_2.18 pthread_cond_signal F
>  GLIBC_2.18 pthread_cond_timedwait F
>  GLIBC_2.18 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index 30fd457419..f431bf8a5d 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.18 pthread_barrierattr_init F
>  GLIBC_2.18 pthread_barrierattr_setpshared F
>  GLIBC_2.18 pthread_cancel F
>  GLIBC_2.18 pthread_cond_broadcast F
> -GLIBC_2.18 pthread_cond_init F
>  GLIBC_2.18 pthread_cond_signal F
>  GLIBC_2.18 pthread_cond_timedwait F
>  GLIBC_2.18 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 2d5730fc8f..fe97a30c54 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -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
> @@ -204,7 +203,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 2d5730fc8f..fe97a30c54 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -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
> @@ -204,7 +203,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 94f6396182..26e2a33bbe 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.21 pthread_barrierattr_init F
>  GLIBC_2.21 pthread_barrierattr_setpshared F
>  GLIBC_2.21 pthread_cancel F
>  GLIBC_2.21 pthread_cond_broadcast F
> -GLIBC_2.21 pthread_cond_init F
>  GLIBC_2.21 pthread_cond_signal F
>  GLIBC_2.21 pthread_cond_timedwait F
>  GLIBC_2.21 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 62e8dba625..0b9363ab7a 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -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
> @@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index ada466504c..6b0da1ac89 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -106,7 +106,6 @@ GLIBC_2.3 pthread_barrierattr_init F
>  GLIBC_2.3 pthread_barrierattr_setpshared F
>  GLIBC_2.3 pthread_cancel F
>  GLIBC_2.3 pthread_cond_broadcast F
> -GLIBC_2.3 pthread_cond_init F
>  GLIBC_2.3 pthread_cond_signal F
>  GLIBC_2.3 pthread_cond_timedwait F
>  GLIBC_2.3 pthread_cond_wait F
> @@ -195,7 +194,6 @@ GLIBC_2.3 system F
>  GLIBC_2.3 tcdrain F
>  GLIBC_2.3 write F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index 6237b22222..ca00e45ff6 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.17 pthread_barrierattr_init F
>  GLIBC_2.17 pthread_barrierattr_setpshared F
>  GLIBC_2.17 pthread_cancel F
>  GLIBC_2.17 pthread_cond_broadcast F
> -GLIBC_2.17 pthread_cond_init F
>  GLIBC_2.17 pthread_cond_signal F
>  GLIBC_2.17 pthread_cond_timedwait F
>  GLIBC_2.17 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 30a1e15e90..52b91a3f46 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -83,7 +83,6 @@ GLIBC_2.27 pthread_barrierattr_init F
>  GLIBC_2.27 pthread_barrierattr_setpshared F
>  GLIBC_2.27 pthread_cancel F
>  GLIBC_2.27 pthread_cond_broadcast F
> -GLIBC_2.27 pthread_cond_init F
>  GLIBC_2.27 pthread_cond_signal F
>  GLIBC_2.27 pthread_cond_timedwait F
>  GLIBC_2.27 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index a9a8c7630e..b84a2bf02f 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -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
> @@ -207,7 +206,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 7052913b40..e85906c843 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -88,7 +88,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
>  GLIBC_2.2 pthread_cond_wait F
> @@ -199,7 +198,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index 1ac88709aa..251d48e7e3 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
>  GLIBC_2.2 pthread_cond_wait F
> @@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index 1ac88709aa..251d48e7e3 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
>  GLIBC_2.2 pthread_cond_wait F
> @@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index be6e5dcd3d..7a678786d7 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 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_cond_broadcast F
> -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
> @@ -205,7 +204,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index a2be53b8c5..ea8f277428 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
>  GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_init F
>  GLIBC_2.2 pthread_cond_signal F
>  GLIBC_2.2 pthread_cond_timedwait F
>  GLIBC_2.2 pthread_cond_wait F
> @@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index 90780c92d4..dc3231b3d8 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.2.5 pthread_barrierattr_init F
>  GLIBC_2.2.5 pthread_barrierattr_setpshared F
>  GLIBC_2.2.5 pthread_cancel F
>  GLIBC_2.2.5 pthread_cond_broadcast F
> -GLIBC_2.2.5 pthread_cond_init F
>  GLIBC_2.2.5 pthread_cond_signal F
>  GLIBC_2.2.5 pthread_cond_timedwait F
>  GLIBC_2.2.5 pthread_cond_wait F
> @@ -197,7 +196,6 @@ GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
>  GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_init F
>  GLIBC_2.3.2 pthread_cond_signal F
>  GLIBC_2.3.2 pthread_cond_timedwait F
>  GLIBC_2.3.2 pthread_cond_wait F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index b24b7b637e..dda01deac9 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -86,7 +86,6 @@ GLIBC_2.16 pthread_barrierattr_init F
>  GLIBC_2.16 pthread_barrierattr_setpshared F
>  GLIBC_2.16 pthread_cancel F
>  GLIBC_2.16 pthread_cond_broadcast F
> -GLIBC_2.16 pthread_cond_init F
>  GLIBC_2.16 pthread_cond_signal F
>  GLIBC_2.16 pthread_cond_timedwait F
>  GLIBC_2.16 pthread_cond_wait F
> 

Ok.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 11/13] Add hidden prototypes for __sched_getparam, __sched_getscheduler
  2020-02-11 11:06 ` [PATCH 11/13] Add hidden prototypes for __sched_getparam, __sched_getscheduler Florian Weimer
@ 2020-02-19 17:50   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:50 UTC (permalink / raw)
  To: libc-alpha



On 11/02/2020 08:06, Florian Weimer wrote:
> This will enable them to be used in libc.so without PLTs.

LGTM, thanks.

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

> ---
>  include/sched.h    | 2 ++
>  posix/sched_getp.c | 1 +
>  posix/sched_gets.c | 1 +
>  3 files changed, 4 insertions(+)
> 
> diff --git a/include/sched.h b/include/sched.h
> index 4abc440176..b0bf971c93 100644
> --- a/include/sched.h
> +++ b/include/sched.h
> @@ -7,10 +7,12 @@ extern int __sched_setparam (__pid_t __pid,
>  			     const struct sched_param *__param);
>  libc_hidden_proto (__sched_setparam)
>  extern int __sched_getparam (__pid_t __pid, struct sched_param *__param);
> +libc_hidden_proto (__sched_getparam)
>  extern int __sched_setscheduler (__pid_t __pid, int __policy,
>  				 const struct sched_param *__param);
>  libc_hidden_proto (__sched_setscheduler)
>  extern int __sched_getscheduler (__pid_t __pid);
> +libc_hidden_proto (__sched_getscheduler)
>  extern int __sched_yield (void);
>  libc_hidden_proto (__sched_yield)
>  extern int __sched_get_priority_max (int __algorithm);

Ok.

> diff --git a/posix/sched_getp.c b/posix/sched_getp.c
> index 32a5087850..014ea0f7ce 100644
> --- a/posix/sched_getp.c
> +++ b/posix/sched_getp.c
> @@ -27,6 +27,7 @@ __sched_getparam (pid_t pid, struct sched_param *param)
>    __set_errno (ENOSYS);
>    return -1;
>  }
> +libc_hidden_def (__sched_getparam)
>  stub_warning (sched_getparam)
>  
>  weak_alias (__sched_getparam, sched_getparam)

Ok.

> diff --git a/posix/sched_gets.c b/posix/sched_gets.c
> index 356e2f22fe..07dd67054f 100644
> --- a/posix/sched_gets.c
> +++ b/posix/sched_gets.c
> @@ -27,6 +27,7 @@ __sched_getscheduler (pid_t pid)
>    __set_errno (ENOSYS);
>    return -1;
>  }
> +libc_hidden_def (__sched_getscheduler)
>  stub_warning (sched_getscheduler)
>  
>  weak_alias (__sched_getscheduler, sched_getscheduler)
> 

OK.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 12/13] nptl: Move pthread_getschedparam implementation into libc
  2020-02-11 11:06 ` [PATCH 12/13] nptl: Move pthread_getschedparam implementation into libc Florian Weimer
@ 2020-02-19 17:51   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:51 UTC (permalink / raw)
  To: libc-alpha



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                                                 | 3 ---
>  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(+), 34 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index eb87ecb1b3..f6a05799ad 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -56,6 +56,7 @@ routines = \
>    pthread_condattr_destroy \
>    pthread_condattr_init \
>    pthread_equal \
> +  pthread_getschedparam \
>    pthread_self \
>    register-atfork \
>  

Ok.

> @@ -79,7 +80,7 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
>  		      pthread_join pthread_tryjoin pthread_timedjoin \
>  		      pthread_clockjoin pthread_join_common pthread_yield \
>  		      pthread_getconcurrency pthread_setconcurrency \
> -		      pthread_getschedparam pthread_setschedparam \
> +		      pthread_setschedparam \
>  		      pthread_setschedprio \
>  		      pthread_attr_getguardsize pthread_attr_setguardsize \
>  		      pthread_attr_getstackaddr pthread_attr_setstackaddr \

Ok.

> diff --git a/nptl/Versions b/nptl/Versions
> index 914404c45e..ccf7be396b 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -49,7 +49,7 @@ libpthread {
>      pthread_create; pthread_join;
>      pthread_exit; pthread_detach;
>  
> -    pthread_getschedparam; pthread_setschedparam;
> +    pthread_setschedparam;
>  
>      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 6ee4b92d52..f84f7795a2 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -108,9 +108,6 @@ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
>  strong_alias (__pthread_exit, pthread_exit);
>  
>  
> -FORWARD (pthread_getschedparam,
> -	 (pthread_t target_thread, int *policy, struct sched_param *param),
> -	 (target_thread, policy, param), 0)
>  FORWARD (pthread_setschedparam,
>  	 (pthread_t target_thread, int policy,
>  	  const struct sched_param *param), (target_thread, policy, param), 0)

Ok.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 56a4848d6e..3f6a777d59 100644
> --- a/nptl/nptl-init.c
> +++ b/nptl/nptl-init.c
> @@ -83,7 +83,6 @@ static const struct pthread_functions pthread_functions =
>      .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
>  # endif
>      .ptr___pthread_exit = __pthread_exit,
> -    .ptr_pthread_getschedparam = __pthread_getschedparam,
>      .ptr_pthread_setschedparam = __pthread_setschedparam,
>      .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
>      .ptr_pthread_mutex_init = __pthread_mutex_init,

Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 9e12cf7f20..337ef59691 100644
> --- a/sysdeps/nptl/pthread-functions.h
> +++ b/sysdeps/nptl/pthread-functions.h
> @@ -42,7 +42,6 @@ struct pthread_functions
>  					   pthread_mutex_t *,
>  					   const struct timespec *);
>    void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
> -  int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
>    int (*ptr_pthread_setschedparam) (pthread_t, int,
>  				    const struct sched_param *);
>    int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index ca00e45ff6..a0cff69954 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -101,7 +101,6 @@ GLIBC_2.17 pthread_getattr_np F
>  GLIBC_2.17 pthread_getconcurrency F
>  GLIBC_2.17 pthread_getcpuclockid F
>  GLIBC_2.17 pthread_getname_np F
> -GLIBC_2.17 pthread_getschedparam F
>  GLIBC_2.17 pthread_getspecific F
>  GLIBC_2.17 pthread_join F
>  GLIBC_2.17 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 7a678786d7..bb718e4037 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_exit F
> -GLIBC_2.0 pthread_getschedparam F
>  GLIBC_2.0 pthread_getspecific F
>  GLIBC_2.0 pthread_join F
>  GLIBC_2.0 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index cc36449cfd..cabc278df8 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -135,7 +135,6 @@ GLIBC_2.4 pthread_getaffinity_np F
>  GLIBC_2.4 pthread_getattr_np F
>  GLIBC_2.4 pthread_getconcurrency F
>  GLIBC_2.4 pthread_getcpuclockid F
> -GLIBC_2.4 pthread_getschedparam F
>  GLIBC_2.4 pthread_getspecific F
>  GLIBC_2.4 pthread_join F
>  GLIBC_2.4 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index cc36449cfd..cabc278df8 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -135,7 +135,6 @@ GLIBC_2.4 pthread_getaffinity_np F
>  GLIBC_2.4 pthread_getattr_np F
>  GLIBC_2.4 pthread_getconcurrency F
>  GLIBC_2.4 pthread_getcpuclockid F
> -GLIBC_2.4 pthread_getschedparam F
>  GLIBC_2.4 pthread_getspecific F
>  GLIBC_2.4 pthread_join F
>  GLIBC_2.4 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index eacb6a19f7..394fe5e560 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -110,7 +110,6 @@ GLIBC_2.29 pthread_getattr_np F
>  GLIBC_2.29 pthread_getconcurrency F
>  GLIBC_2.29 pthread_getcpuclockid F
>  GLIBC_2.29 pthread_getname_np F
> -GLIBC_2.29 pthread_getschedparam F
>  GLIBC_2.29 pthread_getspecific F
>  GLIBC_2.29 pthread_join F
>  GLIBC_2.29 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index 251d48e7e3..f3606ce4e8 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
>  GLIBC_2.2 pthread_exit F
>  GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
> -GLIBC_2.2 pthread_getschedparam F
>  GLIBC_2.2 pthread_getspecific F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index 51a734aafc..5a6a1d775c 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_exit F
> -GLIBC_2.0 pthread_getschedparam F
>  GLIBC_2.0 pthread_getspecific F
>  GLIBC_2.0 pthread_join F
>  GLIBC_2.0 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index ea8f277428..e7545c83b5 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
>  GLIBC_2.2 pthread_exit F
>  GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
> -GLIBC_2.2 pthread_getschedparam F
>  GLIBC_2.2 pthread_getspecific F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index cc36449cfd..cabc278df8 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -135,7 +135,6 @@ GLIBC_2.4 pthread_getaffinity_np F
>  GLIBC_2.4 pthread_getattr_np F
>  GLIBC_2.4 pthread_getconcurrency F
>  GLIBC_2.4 pthread_getcpuclockid F
> -GLIBC_2.4 pthread_getschedparam F
>  GLIBC_2.4 pthread_getspecific F
>  GLIBC_2.4 pthread_join F
>  GLIBC_2.4 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index 51a734aafc..5a6a1d775c 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_exit F
> -GLIBC_2.0 pthread_getschedparam F
>  GLIBC_2.0 pthread_getspecific F
>  GLIBC_2.0 pthread_join F
>  GLIBC_2.0 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index f431bf8a5d..fa5c6d2773 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -102,7 +102,6 @@ GLIBC_2.18 pthread_getattr_np F
>  GLIBC_2.18 pthread_getconcurrency F
>  GLIBC_2.18 pthread_getcpuclockid F
>  GLIBC_2.18 pthread_getname_np F
> -GLIBC_2.18 pthread_getschedparam F
>  GLIBC_2.18 pthread_getspecific F
>  GLIBC_2.18 pthread_join F
>  GLIBC_2.18 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index f431bf8a5d..fa5c6d2773 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -102,7 +102,6 @@ GLIBC_2.18 pthread_getattr_np F
>  GLIBC_2.18 pthread_getconcurrency F
>  GLIBC_2.18 pthread_getcpuclockid F
>  GLIBC_2.18 pthread_getname_np F
> -GLIBC_2.18 pthread_getschedparam F
>  GLIBC_2.18 pthread_getspecific F
>  GLIBC_2.18 pthread_join F
>  GLIBC_2.18 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index fe97a30c54..2a2343cf68 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_exit F
> -GLIBC_2.0 pthread_getschedparam F
>  GLIBC_2.0 pthread_getspecific F
>  GLIBC_2.0 pthread_join F
>  GLIBC_2.0 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index fe97a30c54..2a2343cf68 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_exit F
> -GLIBC_2.0 pthread_getschedparam F
>  GLIBC_2.0 pthread_getspecific F
>  GLIBC_2.0 pthread_join F
>  GLIBC_2.0 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 26e2a33bbe..f454c862a8 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -102,7 +102,6 @@ GLIBC_2.21 pthread_getattr_np F
>  GLIBC_2.21 pthread_getconcurrency F
>  GLIBC_2.21 pthread_getcpuclockid F
>  GLIBC_2.21 pthread_getname_np F
> -GLIBC_2.21 pthread_getschedparam F
>  GLIBC_2.21 pthread_getspecific F
>  GLIBC_2.21 pthread_join F
>  GLIBC_2.21 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 0b9363ab7a..4d3332216f 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_exit F
> -GLIBC_2.0 pthread_getschedparam F
>  GLIBC_2.0 pthread_getspecific F
>  GLIBC_2.0 pthread_join F
>  GLIBC_2.0 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index 6b0da1ac89..ecc6a3bd60 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -117,7 +117,6 @@ GLIBC_2.3 pthread_exit F
>  GLIBC_2.3 pthread_getattr_np F
>  GLIBC_2.3 pthread_getconcurrency F
>  GLIBC_2.3 pthread_getcpuclockid F
> -GLIBC_2.3 pthread_getschedparam F
>  GLIBC_2.3 pthread_getspecific F
>  GLIBC_2.3 pthread_join F
>  GLIBC_2.3 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index ca00e45ff6..a0cff69954 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -101,7 +101,6 @@ GLIBC_2.17 pthread_getattr_np F
>  GLIBC_2.17 pthread_getconcurrency F
>  GLIBC_2.17 pthread_getcpuclockid F
>  GLIBC_2.17 pthread_getname_np F
> -GLIBC_2.17 pthread_getschedparam F
>  GLIBC_2.17 pthread_getspecific F
>  GLIBC_2.17 pthread_join F
>  GLIBC_2.17 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 52b91a3f46..1e998668f7 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -99,7 +99,6 @@ GLIBC_2.27 pthread_getattr_np F
>  GLIBC_2.27 pthread_getconcurrency F
>  GLIBC_2.27 pthread_getcpuclockid F
>  GLIBC_2.27 pthread_getname_np F
> -GLIBC_2.27 pthread_getschedparam F
>  GLIBC_2.27 pthread_getspecific F
>  GLIBC_2.27 pthread_join F
>  GLIBC_2.27 pthread_key_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 b84a2bf02f..9495b0300b 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_exit F
> -GLIBC_2.0 pthread_getschedparam F
>  GLIBC_2.0 pthread_getspecific F
>  GLIBC_2.0 pthread_join F
>  GLIBC_2.0 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index e85906c843..6de0b3c2bb 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -98,7 +98,6 @@ GLIBC_2.2 pthread_detach F
>  GLIBC_2.2 pthread_exit F
>  GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
> -GLIBC_2.2 pthread_getschedparam F
>  GLIBC_2.2 pthread_getspecific F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index 251d48e7e3..f3606ce4e8 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
>  GLIBC_2.2 pthread_exit F
>  GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
> -GLIBC_2.2 pthread_getschedparam F
>  GLIBC_2.2 pthread_getspecific F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index 251d48e7e3..f3606ce4e8 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
>  GLIBC_2.2 pthread_exit F
>  GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
> -GLIBC_2.2 pthread_getschedparam F
>  GLIBC_2.2 pthread_getspecific F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 7a678786d7..bb718e4037 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -52,7 +52,6 @@ GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_exit F
> -GLIBC_2.0 pthread_getschedparam F
>  GLIBC_2.0 pthread_getspecific F
>  GLIBC_2.0 pthread_join F
>  GLIBC_2.0 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index ea8f277428..e7545c83b5 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -96,7 +96,6 @@ GLIBC_2.2 pthread_detach F
>  GLIBC_2.2 pthread_exit F
>  GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
> -GLIBC_2.2 pthread_getschedparam F
>  GLIBC_2.2 pthread_getspecific F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index dc3231b3d8..2071b125e8 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -97,7 +97,6 @@ GLIBC_2.2.5 pthread_exit F
>  GLIBC_2.2.5 pthread_getattr_np F
>  GLIBC_2.2.5 pthread_getconcurrency F
>  GLIBC_2.2.5 pthread_getcpuclockid F
> -GLIBC_2.2.5 pthread_getschedparam F
>  GLIBC_2.2.5 pthread_getspecific F
>  GLIBC_2.2.5 pthread_join F
>  GLIBC_2.2.5 pthread_key_create F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index dda01deac9..102f4fb1ff 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -101,7 +101,6 @@ GLIBC_2.16 pthread_getattr_np F
>  GLIBC_2.16 pthread_getconcurrency F
>  GLIBC_2.16 pthread_getcpuclockid F
>  GLIBC_2.16 pthread_getname_np F
> -GLIBC_2.16 pthread_getschedparam F
>  GLIBC_2.16 pthread_getspecific F
>  GLIBC_2.16 pthread_join F
>  GLIBC_2.16 pthread_key_create F
> 

Ok.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 13/13] nptl: Move pthread_setschedparam implementation into libc
  2020-02-11 11:06 ` [PATCH 13/13] nptl: Move pthread_setschedparam " Florian Weimer
@ 2020-02-19 17:52   ` Adhemerval Zanella
  0 siblings, 0 replies; 28+ messages in thread
From: Adhemerval Zanella @ 2020-02-19 17:52 UTC (permalink / raw)
  To: libc-alpha



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                                               | 5 -----
>  nptl/nptl-init.c                                             | 1 -
>  sysdeps/nptl/pthread-functions.h                             | 2 --
>  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, 1 insertion(+), 38 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index f6a05799ad..b34110c986 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -58,6 +58,7 @@ routines = \
>    pthread_equal \
>    pthread_getschedparam \
>    pthread_self \
> +  pthread_setschedparam \
>    register-atfork \
>  
>  shared-only-routines = forward

Ok.

> @@ -80,7 +81,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
>  		      pthread_join pthread_tryjoin pthread_timedjoin \
>  		      pthread_clockjoin pthread_join_common pthread_yield \
>  		      pthread_getconcurrency pthread_setconcurrency \
> -		      pthread_setschedparam \
>  		      pthread_setschedprio \
>  		      pthread_attr_getguardsize pthread_attr_setguardsize \
>  		      pthread_attr_getstackaddr pthread_attr_setstackaddr \

Ok.

> diff --git a/nptl/Versions b/nptl/Versions
> index ccf7be396b..543dddc4ee 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -49,8 +49,6 @@ libpthread {
>      pthread_create; pthread_join;
>      pthread_exit; pthread_detach;
>  
> -    pthread_setschedparam;
> -
>      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 f84f7795a2..d486c9fec9 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -108,11 +108,6 @@ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
>  strong_alias (__pthread_exit, pthread_exit);
>  
>  
> -FORWARD (pthread_setschedparam,
> -	 (pthread_t target_thread, int policy,
> -	  const struct sched_param *param), (target_thread, policy, param), 0)
> -
> -
>  FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0)
>  
>  FORWARD (pthread_mutex_init,

Ok.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index 3f6a777d59..ef7d3a4a4a 100644
> --- a/nptl/nptl-init.c
> +++ b/nptl/nptl-init.c
> @@ -83,7 +83,6 @@ static const struct pthread_functions pthread_functions =
>      .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
>  # endif
>      .ptr___pthread_exit = __pthread_exit,
> -    .ptr_pthread_setschedparam = __pthread_setschedparam,
>      .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
>      .ptr_pthread_mutex_init = __pthread_mutex_init,
>      .ptr_pthread_mutex_lock = __pthread_mutex_lock,

Ok.

> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index 337ef59691..294b7e1119 100644
> --- a/sysdeps/nptl/pthread-functions.h
> +++ b/sysdeps/nptl/pthread-functions.h
> @@ -42,8 +42,6 @@ struct pthread_functions
>  					   pthread_mutex_t *,
>  					   const struct timespec *);
>    void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
> -  int (*ptr_pthread_setschedparam) (pthread_t, int,
> -				    const struct sched_param *);
>    int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
>    int (*ptr_pthread_mutex_init) (pthread_mutex_t *,
>  				 const pthread_mutexattr_t *);

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index a0cff69954..d65beba958 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -154,7 +154,6 @@ GLIBC_2.17 pthread_setcancelstate F
>  GLIBC_2.17 pthread_setcanceltype F
>  GLIBC_2.17 pthread_setconcurrency F
>  GLIBC_2.17 pthread_setname_np F
> -GLIBC_2.17 pthread_setschedparam F
>  GLIBC_2.17 pthread_setschedprio F
>  GLIBC_2.17 pthread_setspecific F
>  GLIBC_2.17 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index bb718e4037..ffd443422d 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
>  GLIBC_2.0 pthread_once F
>  GLIBC_2.0 pthread_setcancelstate F
>  GLIBC_2.0 pthread_setcanceltype F
> -GLIBC_2.0 pthread_setschedparam F
>  GLIBC_2.0 pthread_setspecific F
>  GLIBC_2.0 pthread_sigmask F
>  GLIBC_2.0 pthread_testcancel F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index cabc278df8..129c64b0a7 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -184,7 +184,6 @@ GLIBC_2.4 pthread_setaffinity_np F
>  GLIBC_2.4 pthread_setcancelstate F
>  GLIBC_2.4 pthread_setcanceltype F
>  GLIBC_2.4 pthread_setconcurrency F
> -GLIBC_2.4 pthread_setschedparam F
>  GLIBC_2.4 pthread_setschedprio F
>  GLIBC_2.4 pthread_setspecific F
>  GLIBC_2.4 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index cabc278df8..129c64b0a7 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -184,7 +184,6 @@ GLIBC_2.4 pthread_setaffinity_np F
>  GLIBC_2.4 pthread_setcancelstate F
>  GLIBC_2.4 pthread_setcanceltype F
>  GLIBC_2.4 pthread_setconcurrency F
> -GLIBC_2.4 pthread_setschedparam F
>  GLIBC_2.4 pthread_setschedprio F
>  GLIBC_2.4 pthread_setspecific F
>  GLIBC_2.4 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 394fe5e560..8b72528819 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -164,7 +164,6 @@ GLIBC_2.29 pthread_setcancelstate F
>  GLIBC_2.29 pthread_setcanceltype F
>  GLIBC_2.29 pthread_setconcurrency F
>  GLIBC_2.29 pthread_setname_np F
> -GLIBC_2.29 pthread_setschedparam F
>  GLIBC_2.29 pthread_setschedprio F
>  GLIBC_2.29 pthread_setspecific F
>  GLIBC_2.29 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index f3606ce4e8..84fa775d95 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
>  GLIBC_2.2 pthread_setcancelstate F
>  GLIBC_2.2 pthread_setcanceltype F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 pthread_setschedparam F
>  GLIBC_2.2 pthread_setspecific F
>  GLIBC_2.2 pthread_sigmask F
>  GLIBC_2.2 pthread_spin_destroy F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index 5a6a1d775c..4727bd5d43 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
>  GLIBC_2.0 pthread_once F
>  GLIBC_2.0 pthread_setcancelstate F
>  GLIBC_2.0 pthread_setcanceltype F
> -GLIBC_2.0 pthread_setschedparam F
>  GLIBC_2.0 pthread_setspecific F
>  GLIBC_2.0 pthread_sigmask F
>  GLIBC_2.0 pthread_testcancel F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index e7545c83b5..3d947a66aa 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
>  GLIBC_2.2 pthread_setcancelstate F
>  GLIBC_2.2 pthread_setcanceltype F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 pthread_setschedparam F
>  GLIBC_2.2 pthread_setspecific F
>  GLIBC_2.2 pthread_sigmask F
>  GLIBC_2.2 pthread_spin_destroy F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index cabc278df8..129c64b0a7 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -184,7 +184,6 @@ GLIBC_2.4 pthread_setaffinity_np F
>  GLIBC_2.4 pthread_setcancelstate F
>  GLIBC_2.4 pthread_setcanceltype F
>  GLIBC_2.4 pthread_setconcurrency F
> -GLIBC_2.4 pthread_setschedparam F
>  GLIBC_2.4 pthread_setschedprio F
>  GLIBC_2.4 pthread_setspecific F
>  GLIBC_2.4 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index 5a6a1d775c..4727bd5d43 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
>  GLIBC_2.0 pthread_once F
>  GLIBC_2.0 pthread_setcancelstate F
>  GLIBC_2.0 pthread_setcanceltype F
> -GLIBC_2.0 pthread_setschedparam F
>  GLIBC_2.0 pthread_setspecific F
>  GLIBC_2.0 pthread_sigmask F
>  GLIBC_2.0 pthread_testcancel F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index fa5c6d2773..78885c05cf 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -156,7 +156,6 @@ GLIBC_2.18 pthread_setcancelstate F
>  GLIBC_2.18 pthread_setcanceltype F
>  GLIBC_2.18 pthread_setconcurrency F
>  GLIBC_2.18 pthread_setname_np F
> -GLIBC_2.18 pthread_setschedparam F
>  GLIBC_2.18 pthread_setschedprio F
>  GLIBC_2.18 pthread_setspecific F
>  GLIBC_2.18 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index fa5c6d2773..78885c05cf 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -156,7 +156,6 @@ GLIBC_2.18 pthread_setcancelstate F
>  GLIBC_2.18 pthread_setcanceltype F
>  GLIBC_2.18 pthread_setconcurrency F
>  GLIBC_2.18 pthread_setname_np F
> -GLIBC_2.18 pthread_setschedparam F
>  GLIBC_2.18 pthread_setschedprio F
>  GLIBC_2.18 pthread_setspecific F
>  GLIBC_2.18 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 2a2343cf68..62f7a3f349 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
>  GLIBC_2.0 pthread_once F
>  GLIBC_2.0 pthread_setcancelstate F
>  GLIBC_2.0 pthread_setcanceltype F
> -GLIBC_2.0 pthread_setschedparam F
>  GLIBC_2.0 pthread_setspecific F
>  GLIBC_2.0 pthread_sigmask F
>  GLIBC_2.0 pthread_testcancel F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 2a2343cf68..62f7a3f349 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
>  GLIBC_2.0 pthread_once F
>  GLIBC_2.0 pthread_setcancelstate F
>  GLIBC_2.0 pthread_setcanceltype F
> -GLIBC_2.0 pthread_setschedparam F
>  GLIBC_2.0 pthread_setspecific F
>  GLIBC_2.0 pthread_sigmask F
>  GLIBC_2.0 pthread_testcancel F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index f454c862a8..45ebcf5a6c 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -156,7 +156,6 @@ GLIBC_2.21 pthread_setcancelstate F
>  GLIBC_2.21 pthread_setcanceltype F
>  GLIBC_2.21 pthread_setconcurrency F
>  GLIBC_2.21 pthread_setname_np F
> -GLIBC_2.21 pthread_setschedparam F
>  GLIBC_2.21 pthread_setschedprio F
>  GLIBC_2.21 pthread_setspecific F
>  GLIBC_2.21 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 4d3332216f..2f4ed55693 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
>  GLIBC_2.0 pthread_once F
>  GLIBC_2.0 pthread_setcancelstate F
>  GLIBC_2.0 pthread_setcanceltype F
> -GLIBC_2.0 pthread_setschedparam F
>  GLIBC_2.0 pthread_setspecific F
>  GLIBC_2.0 pthread_sigmask F
>  GLIBC_2.0 pthread_testcancel F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index ecc6a3bd60..f4d34b1c47 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -156,7 +156,6 @@ GLIBC_2.3 pthread_rwlockattr_setpshared F
>  GLIBC_2.3 pthread_setcancelstate F
>  GLIBC_2.3 pthread_setcanceltype F
>  GLIBC_2.3 pthread_setconcurrency F
> -GLIBC_2.3 pthread_setschedparam F
>  GLIBC_2.3 pthread_setspecific F
>  GLIBC_2.3 pthread_sigmask F
>  GLIBC_2.3 pthread_spin_destroy F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index a0cff69954..d65beba958 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -154,7 +154,6 @@ GLIBC_2.17 pthread_setcancelstate F
>  GLIBC_2.17 pthread_setcanceltype F
>  GLIBC_2.17 pthread_setconcurrency F
>  GLIBC_2.17 pthread_setname_np F
> -GLIBC_2.17 pthread_setschedparam F
>  GLIBC_2.17 pthread_setschedprio F
>  GLIBC_2.17 pthread_setspecific F
>  GLIBC_2.17 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 1e998668f7..5610e51e10 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -153,7 +153,6 @@ GLIBC_2.27 pthread_setcancelstate F
>  GLIBC_2.27 pthread_setcanceltype F
>  GLIBC_2.27 pthread_setconcurrency F
>  GLIBC_2.27 pthread_setname_np F
> -GLIBC_2.27 pthread_setschedparam F
>  GLIBC_2.27 pthread_setschedprio F
>  GLIBC_2.27 pthread_setspecific F
>  GLIBC_2.27 pthread_sigmask F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index 9495b0300b..80ad434007 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
>  GLIBC_2.0 pthread_once F
>  GLIBC_2.0 pthread_setcancelstate F
>  GLIBC_2.0 pthread_setcanceltype F
> -GLIBC_2.0 pthread_setschedparam F
>  GLIBC_2.0 pthread_setspecific F
>  GLIBC_2.0 pthread_sigmask F
>  GLIBC_2.0 pthread_testcancel F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 6de0b3c2bb..daef2b5cd5 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -137,7 +137,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
>  GLIBC_2.2 pthread_setcancelstate F
>  GLIBC_2.2 pthread_setcanceltype F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 pthread_setschedparam F
>  GLIBC_2.2 pthread_setspecific F
>  GLIBC_2.2 pthread_sigmask F
>  GLIBC_2.2 pthread_spin_destroy F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index f3606ce4e8..84fa775d95 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
>  GLIBC_2.2 pthread_setcancelstate F
>  GLIBC_2.2 pthread_setcanceltype F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 pthread_setschedparam F
>  GLIBC_2.2 pthread_setspecific F
>  GLIBC_2.2 pthread_sigmask F
>  GLIBC_2.2 pthread_spin_destroy F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index f3606ce4e8..84fa775d95 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
>  GLIBC_2.2 pthread_setcancelstate F
>  GLIBC_2.2 pthread_setcanceltype F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 pthread_setschedparam F
>  GLIBC_2.2 pthread_setspecific F
>  GLIBC_2.2 pthread_sigmask F
>  GLIBC_2.2 pthread_spin_destroy F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index bb718e4037..ffd443422d 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -70,7 +70,6 @@ GLIBC_2.0 pthread_mutexattr_setkind_np F
>  GLIBC_2.0 pthread_once F
>  GLIBC_2.0 pthread_setcancelstate F
>  GLIBC_2.0 pthread_setcanceltype F
> -GLIBC_2.0 pthread_setschedparam F
>  GLIBC_2.0 pthread_setspecific F
>  GLIBC_2.0 pthread_sigmask F
>  GLIBC_2.0 pthread_testcancel F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index e7545c83b5..3d947a66aa 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -135,7 +135,6 @@ GLIBC_2.2 pthread_rwlockattr_setpshared F
>  GLIBC_2.2 pthread_setcancelstate F
>  GLIBC_2.2 pthread_setcanceltype F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 pthread_setschedparam F
>  GLIBC_2.2 pthread_setspecific F
>  GLIBC_2.2 pthread_sigmask F
>  GLIBC_2.2 pthread_spin_destroy F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index 2071b125e8..a6bc9f4a55 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -136,7 +136,6 @@ GLIBC_2.2.5 pthread_rwlockattr_setpshared F
>  GLIBC_2.2.5 pthread_setcancelstate F
>  GLIBC_2.2.5 pthread_setcanceltype F
>  GLIBC_2.2.5 pthread_setconcurrency F
> -GLIBC_2.2.5 pthread_setschedparam F
>  GLIBC_2.2.5 pthread_setspecific F
>  GLIBC_2.2.5 pthread_sigmask F
>  GLIBC_2.2.5 pthread_spin_destroy F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 102f4fb1ff..17f6ec438f 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -154,7 +154,6 @@ GLIBC_2.16 pthread_setcancelstate F
>  GLIBC_2.16 pthread_setcanceltype F
>  GLIBC_2.16 pthread_setconcurrency F
>  GLIBC_2.16 pthread_setname_np F
> -GLIBC_2.16 pthread_setschedparam F
>  GLIBC_2.16 pthread_setschedprio F
>  GLIBC_2.16 pthread_setspecific F
>  GLIBC_2.16 pthread_sigmask F
> 

Ok.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PATCH 02/13] nptl: Sort routines list in Makefile alphabetically
  2020-02-19 17:34   ` Adhemerval Zanella
@ 2020-02-20  7:54     ` Florian Weimer
  0 siblings, 0 replies; 28+ messages in thread
From: Florian Weimer @ 2020-02-20  7:54 UTC (permalink / raw)
  To: Adhemerval Zanella; +Cc: libc-alpha

* Adhemerval Zanella:

> On 11/02/2020 08:06, Florian Weimer wrote:
>> This will make it easier to review changes which move implementations
>> from libpthread to libc.
>
> This organization does help a lot not only refactoring, but also new
> files. Maybe we could enforce it from now one, thoughts?

We are using this construct in a few other places.  Andreas did not like
the final line with the trailing \ though.

routines += function

would avoid that, but it has quadratic behavior in make, and that could
be actually visible in a few places.

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

Thanks for all the reviews.

FlFlorian


^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2020-02-20  7:54 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-11 11:05 [PATCH 00/13] nptl: Move more functions from libpthread to libc Florian Weimer
2020-02-11 11:06 ` [PATCH 01/13] nptl: Use .NOTPARALLEL in Makefile only if actually running tests Florian Weimer
2020-02-19 17:28   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 02/13] nptl: Sort routines list in Makefile alphabetically Florian Weimer
2020-02-19 17:34   ` Adhemerval Zanella
2020-02-20  7:54     ` Florian Weimer
2020-02-11 11:06 ` [PATCH 03/13] nptl: Move pthread_attr_getschedpolicy implementation into libc Florian Weimer
2020-02-19 17:38   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 04/13] nptl: Move pthread_attr_setschedpolicy " Florian Weimer
2020-02-19 17:39   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 05/13] nptl: Move pthread_attr_getscope " Florian Weimer
2020-02-19 17:40   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 06/13] nptl: Move pthread_attr_setscope " Florian Weimer
2020-02-19 17:41   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 07/13] nptl: Move pthread_condattr_destroy " Florian Weimer
2020-02-19 17:42   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 08/13] nptl: Move pthread_condattr_init " Florian Weimer
2020-02-19 17:42   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 09/13] nptl: Move pthread_cond_destroy " Florian Weimer
2020-02-19 17:48   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 10/13] nptl: Move pthread_cond_init " Florian Weimer
2020-02-19 17:50   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 11/13] Add hidden prototypes for __sched_getparam, __sched_getscheduler Florian Weimer
2020-02-19 17:50   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 12/13] nptl: Move pthread_getschedparam implementation into libc Florian Weimer
2020-02-19 17:51   ` Adhemerval Zanella
2020-02-11 11:06 ` [PATCH 13/13] nptl: Move pthread_setschedparam " Florian Weimer
2020-02-19 17:52   ` Adhemerval Zanella

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).