]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
nptl: Move pthread_equal implementation into libc
authorFlorian Weimer <fweimer@redhat.com>
Thu, 15 Aug 2019 06:48:31 +0000 (08:48 +0200)
committerFlorian Weimer <fweimer@redhat.com>
Thu, 15 Aug 2019 06:48:31 +0000 (08:48 +0200)
29 files changed:
ChangeLog
nptl/Makefile
nptl/forward.c
nptl/nptl-init.c
sysdeps/nptl/pthread-functions.h
sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
sysdeps/unix/sysv/linux/alpha/libpthread.abilist
sysdeps/unix/sysv/linux/arm/libpthread.abilist
sysdeps/unix/sysv/linux/csky/libpthread.abilist
sysdeps/unix/sysv/linux/hppa/libpthread.abilist
sysdeps/unix/sysv/linux/i386/libpthread.abilist
sysdeps/unix/sysv/linux/ia64/libpthread.abilist
sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
sysdeps/unix/sysv/linux/microblaze/libpthread.abilist
sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
sysdeps/unix/sysv/linux/nios2/libpthread.abilist
sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
sysdeps/unix/sysv/linux/sh/libpthread.abilist
sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist

index 6e44a577d1caf08b2869933553bfee5c90ea6ae7..1fa183b8b004515e475e6546a18613da4e7a7038 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+2019-08-15  Florian Weimer  <fweimer@redhat.com>
+
+       nptl: Move pthread_equal implementation into libc.
+       * nptl/Makefile (routines): Add pthread_equal.
+       * nptl/forward.c (pthread_equal): Remove definition.
+       * nptl/nptl-init.c (pthread_functions): Remove initializer for
+       ptr_pthread_equal.
+       * sysdeps/nptl/pthread-functions.h (struct pthread_functions):
+       Remove ptr_pthread_equal member.
+       * sysdeps/unix/sysv/linux/aarch64/libpthread.abilist (GLIBC_2.17):
+       Remove pthread_equal.
+       * sysdeps/unix/sysv/linux/alpha/libpthread.abilist (GLIBC_2.0):
+       Likewise.
+       * sysdeps/unix/sysv/linux/arm/libpthread.abilist (GLIBC_2.4):
+       Likewise.
+       * sysdeps/unix/sysv/linux/csky/libpthread.abilist (GLIBC_2.29):
+       Likewise.
+       * sysdeps/unix/sysv/linux/hppa/libpthread.abilist (GLIBC_2.2):
+       Likewise.
+       * sysdeps/unix/sysv/linux/i386/libpthread.abilist (GLIBC_2.0):
+       Likewise.
+       * sysdeps/unix/sysv/linux/ia64/libpthread.abilist (GLIBC_2.2):
+       Likewise.
+       * sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+       (GLIBC_2.4): Likewise.
+       * sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+       (GLIBC_2.0): Likewise.
+       * sysdeps/unix/sysv/linux/microblaze/libpthread.abilist
+       (GLIBC_2.18): Likewise.
+       * sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+       (GLIBC_2.0): Likewise.
+       * sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+       (GLIBC_2.0): Likewise.
+       * sysdeps/unix/sysv/linux/nios2/libpthread.abilist (GLIBC_2.21):
+       Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+       (GLIBC_2.0): Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+       (GLIBC_2.3): Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+       (GLIBC_2.17): Likewise.
+       * sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+       (GLIBC_2.27): Likewise.
+       * sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+       (GLIBC_2.0): Likewise.
+       * sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+       (GLIBC_2.2): Likewise.
+       * sysdeps/unix/sysv/linux/sh/libpthread.abilist (GLIBC_2.2):
+       Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+       (GLIBC_2.0): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+       (GLIBC_2.2): Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+       (GLIBC_2.2.5): Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+       (GLIBC_2.16): Likewise.
+
 2019-08-14  Florian Weimer  <fweimer@redhat.com>
 
        * support/support_descriptors.c: Include <support/descriptors.h>.
index 0567e77a790b9f9bbba8c88e9137941df7541298..e66b115562df37f37437549de7fdbd99b1cdbf7f 100644 (file)
@@ -30,7 +30,7 @@ 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 thrd_current \
-          thrd_equal thrd_sleep thrd_yield
+          thrd_equal thrd_sleep thrd_yield pthread_equal
 shared-only-routines = forward
 static-only-routines = pthread_atfork
 
@@ -50,7 +50,7 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
                      pthread_create pthread_exit pthread_detach \
                      pthread_join pthread_tryjoin pthread_timedjoin \
                      pthread_join_common \
-                     compat-pthread_self pthread_equal pthread_yield \
+                     compat-pthread_self pthread_yield \
                      pthread_getconcurrency pthread_setconcurrency \
                      pthread_getschedparam pthread_setschedparam \
                      pthread_setschedprio \
index ed1e7d03504ae45ea99cfdc673dc19d663542736..3ec9a46078746f7aa47363e18280364843b8c3f4 100644 (file)
@@ -166,10 +166,6 @@ versioned_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait,
                  GLIBC_2_3_2);
 
 
-FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2),
-        (thread1, thread2), 1)
-
-
 FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
                  exit (EXIT_SUCCESS))
 strong_alias (__pthread_exit, pthread_exit);
index 73935f8be41f102034babb8e1a5cfb6852a95566..5734e21bd9f035baa33a13582bc46dd0d25a6c15 100644 (file)
@@ -103,7 +103,6 @@ static const struct pthread_functions pthread_functions =
     .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
     .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
 # endif
-    .ptr_pthread_equal = __pthread_equal,
     .ptr___pthread_exit = __pthread_exit,
     .ptr_pthread_getschedparam = __pthread_getschedparam,
     .ptr_pthread_setschedparam = __pthread_setschedparam,
index cd5e94d1a6c3d6cfcc3bab8788dffbfe32da364a..edb42d341b91c7866a6c5819c5f37359cf5869a2 100644 (file)
@@ -64,7 +64,6 @@ struct pthread_functions
   int (*ptr___pthread_cond_timedwait_2_0) (pthread_cond_2_0_t *,
                                           pthread_mutex_t *,
                                           const struct timespec *);
-  int (*ptr_pthread_equal) (pthread_t, pthread_t);
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
   int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
   int (*ptr_pthread_setschedparam) (pthread_t, int,
index 48c8e956bf686b6b72907cb71e018ff4008897e6..3c06f7a7c267c05bf6cc7a015c55525e77a8ddf2 100644 (file)
@@ -114,7 +114,6 @@ GLIBC_2.17 pthread_condattr_setclock F
 GLIBC_2.17 pthread_condattr_setpshared F
 GLIBC_2.17 pthread_create F
 GLIBC_2.17 pthread_detach F
-GLIBC_2.17 pthread_equal F
 GLIBC_2.17 pthread_exit F
 GLIBC_2.17 pthread_getaffinity_np F
 GLIBC_2.17 pthread_getattr_np F
index d1912b159c43b5ff68e713e16a8449d901946192..de3c56150283463fcafbac4847836e8ede3f3237 100644 (file)
@@ -69,7 +69,6 @@ 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
-GLIBC_2.0 pthread_equal F
 GLIBC_2.0 pthread_exit F
 GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
index 23d6f91363682a946d44dc11e72e9b8a7ee15956..a11a84ea4dc3c610525f9de8e54f4f21730f1ab3 100644 (file)
@@ -148,7 +148,6 @@ GLIBC_2.4 pthread_condattr_setclock F
 GLIBC_2.4 pthread_condattr_setpshared F
 GLIBC_2.4 pthread_create F
 GLIBC_2.4 pthread_detach F
-GLIBC_2.4 pthread_equal F
 GLIBC_2.4 pthread_exit F
 GLIBC_2.4 pthread_getaffinity_np F
 GLIBC_2.4 pthread_getattr_np F
index 52373fc28787e00394971e63a19f62db467b1193..d95aa8cc9db465e665c1c764b8470d2dab731889 100644 (file)
@@ -122,7 +122,6 @@ GLIBC_2.29 pthread_condattr_setclock F
 GLIBC_2.29 pthread_condattr_setpshared F
 GLIBC_2.29 pthread_create F
 GLIBC_2.29 pthread_detach F
-GLIBC_2.29 pthread_equal F
 GLIBC_2.29 pthread_exit F
 GLIBC_2.29 pthread_getaffinity_np F
 GLIBC_2.29 pthread_getattr_default_np F
index 71ff910bfd2c6adab1fbc91e4c8b3a00787c8de9..eef00dc1cc2782f34119ca14d9c5c477ff2bdfab 100644 (file)
@@ -111,7 +111,6 @@ 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
-GLIBC_2.2 pthread_equal F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
index e30d05dbb739def7bcea0af5b26c42d9f530eedb..2f85c3370df048c16672c7dc9b3330aca73826fc 100644 (file)
@@ -69,7 +69,6 @@ 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
-GLIBC_2.0 pthread_equal F
 GLIBC_2.0 pthread_exit F
 GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
index 0104488fda9ea8d5021e362ae17a8ae22eb879f0..e219379f57c6a2a4740320fdd4bf1ee5c544708f 100644 (file)
@@ -111,7 +111,6 @@ 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
-GLIBC_2.2 pthread_equal F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
index 23d6f91363682a946d44dc11e72e9b8a7ee15956..a11a84ea4dc3c610525f9de8e54f4f21730f1ab3 100644 (file)
@@ -148,7 +148,6 @@ GLIBC_2.4 pthread_condattr_setclock F
 GLIBC_2.4 pthread_condattr_setpshared F
 GLIBC_2.4 pthread_create F
 GLIBC_2.4 pthread_detach F
-GLIBC_2.4 pthread_equal F
 GLIBC_2.4 pthread_exit F
 GLIBC_2.4 pthread_getaffinity_np F
 GLIBC_2.4 pthread_getattr_np F
index e30d05dbb739def7bcea0af5b26c42d9f530eedb..2f85c3370df048c16672c7dc9b3330aca73826fc 100644 (file)
@@ -69,7 +69,6 @@ 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
-GLIBC_2.0 pthread_equal F
 GLIBC_2.0 pthread_exit F
 GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
index 2e55810b02bbd14fe7ef191bbbc67fc0fd222876..25a9b489f326eb01c211cc374a519bff7e3ad0fc 100644 (file)
@@ -114,7 +114,6 @@ GLIBC_2.18 pthread_condattr_setclock F
 GLIBC_2.18 pthread_condattr_setpshared F
 GLIBC_2.18 pthread_create F
 GLIBC_2.18 pthread_detach F
-GLIBC_2.18 pthread_equal F
 GLIBC_2.18 pthread_exit F
 GLIBC_2.18 pthread_getaffinity_np F
 GLIBC_2.18 pthread_getattr_default_np F
index 9aea7a96e9ecf90473b120b1b4a13afa38923283..9c5562fe8a67156da134056f98e78561d38f3906 100644 (file)
@@ -69,7 +69,6 @@ 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
-GLIBC_2.0 pthread_equal F
 GLIBC_2.0 pthread_exit F
 GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
index 9aea7a96e9ecf90473b120b1b4a13afa38923283..9c5562fe8a67156da134056f98e78561d38f3906 100644 (file)
@@ -69,7 +69,6 @@ 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
-GLIBC_2.0 pthread_equal F
 GLIBC_2.0 pthread_exit F
 GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
index 0150ea362a3c7e690d3f834067e5c6051760a723..666b7884b98124d880b01faba0b6bbdcb15810ef 100644 (file)
@@ -114,7 +114,6 @@ GLIBC_2.21 pthread_condattr_setclock F
 GLIBC_2.21 pthread_condattr_setpshared F
 GLIBC_2.21 pthread_create F
 GLIBC_2.21 pthread_detach F
-GLIBC_2.21 pthread_equal F
 GLIBC_2.21 pthread_exit F
 GLIBC_2.21 pthread_getaffinity_np F
 GLIBC_2.21 pthread_getattr_default_np F
index e958dc323395c83c9ea8022eb6a9ad0d521f88af..91be3af8bea6a1210aa7135986d096e890ef02b1 100644 (file)
@@ -69,7 +69,6 @@ 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
-GLIBC_2.0 pthread_equal F
 GLIBC_2.0 pthread_exit F
 GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
index ae1ffd1ac98c5471b4b551a1772f751aec38d252..214b155741f9e01cd48236bfe69a4187b8fea340 100644 (file)
@@ -132,7 +132,6 @@ 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
-GLIBC_2.3 pthread_equal F
 GLIBC_2.3 pthread_exit F
 GLIBC_2.3 pthread_getattr_np F
 GLIBC_2.3 pthread_getconcurrency F
index 48c8e956bf686b6b72907cb71e018ff4008897e6..3c06f7a7c267c05bf6cc7a015c55525e77a8ddf2 100644 (file)
@@ -114,7 +114,6 @@ GLIBC_2.17 pthread_condattr_setclock F
 GLIBC_2.17 pthread_condattr_setpshared F
 GLIBC_2.17 pthread_create F
 GLIBC_2.17 pthread_detach F
-GLIBC_2.17 pthread_equal F
 GLIBC_2.17 pthread_exit F
 GLIBC_2.17 pthread_getaffinity_np F
 GLIBC_2.17 pthread_getattr_np F
index 7dab4e5139deea595862734cdf3d63b0a5e0b4d8..6255250e19835aff280fb1a4dd7d3f01eaa235af 100644 (file)
@@ -111,7 +111,6 @@ GLIBC_2.27 pthread_condattr_setclock F
 GLIBC_2.27 pthread_condattr_setpshared F
 GLIBC_2.27 pthread_create F
 GLIBC_2.27 pthread_detach F
-GLIBC_2.27 pthread_equal F
 GLIBC_2.27 pthread_exit F
 GLIBC_2.27 pthread_getaffinity_np F
 GLIBC_2.27 pthread_getattr_default_np F
index 841d8ef42ea690dc70f0bbf7d314b2bb115cf7e1..03b2f218bdd8329bf506563acfb141e6dce221a0 100644 (file)
@@ -69,7 +69,6 @@ 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
-GLIBC_2.0 pthread_equal F
 GLIBC_2.0 pthread_exit F
 GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
index ff3441c8ce3aa77c652319b704bb12598a4cabd2..dd35404615599cf98ce50848f59a2ad5204e91fb 100644 (file)
@@ -113,7 +113,6 @@ 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
-GLIBC_2.2 pthread_equal F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
index 71ff910bfd2c6adab1fbc91e4c8b3a00787c8de9..eef00dc1cc2782f34119ca14d9c5c477ff2bdfab 100644 (file)
@@ -111,7 +111,6 @@ 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
-GLIBC_2.2 pthread_equal F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
index d1912b159c43b5ff68e713e16a8449d901946192..de3c56150283463fcafbac4847836e8ede3f3237 100644 (file)
@@ -69,7 +69,6 @@ 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
-GLIBC_2.0 pthread_equal F
 GLIBC_2.0 pthread_exit F
 GLIBC_2.0 pthread_getschedparam F
 GLIBC_2.0 pthread_getspecific F
index 0104488fda9ea8d5021e362ae17a8ae22eb879f0..e219379f57c6a2a4740320fdd4bf1ee5c544708f 100644 (file)
@@ -111,7 +111,6 @@ 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
-GLIBC_2.2 pthread_equal F
 GLIBC_2.2 pthread_exit F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
index 297fec9686d2eceab0f0d31b73669e2ffd83f8d0..90510bbf2c7891d7b2187a92eb34a12c8a340dd2 100644 (file)
@@ -111,7 +111,6 @@ 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
-GLIBC_2.2.5 pthread_equal F
 GLIBC_2.2.5 pthread_exit F
 GLIBC_2.2.5 pthread_getattr_np F
 GLIBC_2.2.5 pthread_getconcurrency F
index 1d04e63423a6894fbc8556328596794b3cd73e13..8ca9d90b71858686550a12ac3024dc110c401b24 100644 (file)
@@ -114,7 +114,6 @@ GLIBC_2.16 pthread_condattr_setclock F
 GLIBC_2.16 pthread_condattr_setpshared F
 GLIBC_2.16 pthread_create F
 GLIBC_2.16 pthread_detach F
-GLIBC_2.16 pthread_equal F
 GLIBC_2.16 pthread_exit F
 GLIBC_2.16 pthread_getaffinity_np F
 GLIBC_2.16 pthread_getattr_np F