diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-02-10 11:30:59 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-02-20 08:57:01 +0100 |
| commit | 249afce2e78ccc71cdb3535aa1feded5764cabe7 (patch) | |
| tree | 02cca2906d8621a79971882dc411210a7d1cbc63 /nptl | |
| parent | dc260acd3875a5e6f5e905966a0af19c3c98aca7 (diff) | |
| download | glibc-249afce2e78ccc71cdb3535aa1feded5764cabe7.zip glibc-249afce2e78ccc71cdb3535aa1feded5764cabe7.tar.gz glibc-249afce2e78ccc71cdb3535aa1feded5764cabe7.tar.bz2 | |
nptl: Move pthread_condattr_destroy implementation into libc
This is part of the libpthread removal project:
<https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 3 | ||||
| -rw-r--r-- | nptl/Versions | 2 | ||||
| -rw-r--r-- | nptl/forward.c | 1 | ||||
| -rw-r--r-- | nptl/nptl-init.c | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 43f8d4d..22765ca 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 5b4852a..22dc309 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 2076495..cf32d8c 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 0a9b1d6..9aebe0a 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, |