diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-02-22 18:30:52 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-02-22 18:30:52 +0100 |
| commit | b5be9ae77e3e266ed83f84f0bb29198d71211aa8 (patch) | |
| tree | 82029d682e3ba2b23a7eb013158cbabf76cb0ed2 /nptl | |
| parent | 2f4019de81024cc0d05a5b5cedb1afb28b59a836 (diff) | |
| download | glibc-b5be9ae77e3e266ed83f84f0bb29198d71211aa8.tar.gz glibc-b5be9ae77e3e266ed83f84f0bb29198d71211aa8.tar.xz glibc-b5be9ae77e3e266ed83f84f0bb29198d71211aa8.zip | |
nptl: Move futex-internal into libc
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>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 4 | ||||
| -rw-r--r-- | nptl/futex-internal.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 62f368af1e..4dd9c6a6a8 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -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 \ diff --git a/nptl/Versions b/nptl/Versions index 694747bb44..6cca579a0a 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -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; diff --git a/nptl/futex-internal.c b/nptl/futex-internal.c index 89b4ba76e9..850bf4fd83 100644 --- a/nptl/futex-internal.c +++ b/nptl/futex-internal.c @@ -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) |