diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-02-10 11:32:45 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-02-20 08:57:01 +0100 |
| commit | 7da5c345a5f527dc6213e8540e4a9c6eceeb6774 (patch) | |
| tree | 19392ecd53f79cbf1222a7ae19f0b26fb7142600 /nptl | |
| parent | 249afce2e78ccc71cdb3535aa1feded5764cabe7 (diff) | |
| download | glibc-7da5c345a5f527dc6213e8540e4a9c6eceeb6774.tar.gz glibc-7da5c345a5f527dc6213e8540e4a9c6eceeb6774.tar.xz glibc-7da5c345a5f527dc6213e8540e4a9c6eceeb6774.zip | |
nptl: Move pthread_condattr_init 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 | 2 | ||||
| -rw-r--r-- | nptl/Versions | 2 | ||||
| -rw-r--r-- | nptl/forward.c | 2 | ||||
| -rw-r--r-- | nptl/nptl-init.c | 1 |
4 files changed, 1 insertions, 6 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 22765ca0db..c5e2349ab7 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 9aebe0abf1..6e681bafd1 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, |