picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nptl: Move futex-internal into libc

Browse source 
This moves  __futex_abstimed_wait64 and
__futex_abstimed_wait_cancelable64 and exports these functions as
GLIBC_PRIVATE.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2021-02-22 18:30:52 +01:00
parent 2f4019de81
commit b5be9ae77e
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nptl/Makefile
View file

@ -31,6 +31,7 @@ extra-libs-others := $(extra-libs)
routines = \
alloca_cutoff \
forward \
futex-internal \
libc-cancellation \
libc-cleanup \
libc_multiple_threads \
@ -97,7 +98,6 @@ libpthread-routines = \
flockfile \
ftrylockfile \
funlockfile \
futex-internal \
herrno \
libpthread-compat \
nptl-init \

4
nptl/Versions
View file

@ -71,6 +71,8 @@ libc {
pthread_sigmask;
}
GLIBC_PRIVATE {
__futex_abstimed_wait64;
__futex_abstimed_wait_cancelable64;
__libc_alloca_cutoff;
__libc_allocate_rtsig_private;
__libc_current_sigrtmax_private;
@ -387,8 +389,6 @@ libpthread {
}
GLIBC_PRIVATE {
__futex_abstimed_wait64;
__futex_abstimed_wait_cancelable64;
__libpthread_freeres;
__pthread_barrier_init;
__pthread_barrier_wait;

4
nptl/futex-internal.c
View file

@ -112,7 +112,7 @@ __futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected,
return __futex_abstimed_wait_common64 (futex_word, expected, clockid,
abstime, private, false);
}
libpthread_hidden_def (__futex_abstimed_wait64)
libc_hidden_def (__futex_abstimed_wait64)
int
__futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
@ -123,4 +123,4 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
return __futex_abstimed_wait_common64 (futex_word, expected, clockid,
abstime, private, true);
}
libpthread_hidden_def (__futex_abstimed_wait_cancelable64)
libc_hidden_def (__futex_abstimed_wait_cancelable64)

4
sysdeps/nptl/futex-internal.h
View file

@ -345,14 +345,14 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
unsigned int expected, clockid_t clockid,
const struct __timespec64* abstime,
int private);
libpthread_hidden_proto (__futex_abstimed_wait_cancelable64);
libc_hidden_proto (__futex_abstimed_wait_cancelable64);
int
__futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected,
clockid_t clockid,
const struct __timespec64* abstime,
int private);
libpthread_hidden_proto (__futex_abstimed_wait64);
libc_hidden_proto (__futex_abstimed_wait64);
static __always_inline int