summaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-02-10 11:26:00 +0100
committerFlorian Weimer <fweimer@redhat.com>2020-02-10 23:19:34 +0100
commit88742f2a6415fd9b5c6fd08eb4b1502e748523e0 (patch)
tree881a822bb64d70d2f29e2a4c88c8cd7cb4cfb873 /nptl
parent8b53078b0f7b991ad82c865f01e7edff7b19b6a7 (diff)
downloadglibc-88742f2a6415fd9b5c6fd08eb4b1502e748523e0.tar.gz
nptl: Move pthread_attr_getscope implementation into libc
This is part of the libpthread removal project: <https://sourceware.org/ml/libc-alpha/2019-10/msg00080.html>
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile3
-rw-r--r--nptl/Versions2
-rw-r--r--nptl/forward.c2
-rw-r--r--nptl/nptl-init.c1
4 files changed, 3 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index c5675e94bf..ce7a4a7578 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,