From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 5/6] nptl: Move futex-internal into libc
Date: Wed, 17 Feb 2021 18:21:55 +0100 [thread overview]
Message-ID: <b81cb43366e3d6e2bb3268c2fd9341f2648b5626.1613582255.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1613582255.git.fweimer@redhat.com>
This moves __futex_abstimed_wait64 and
__futex_abstimed_wait_cancelable64 and exports these functions as
GLIBC_PRIVATE.
---
nptl/Makefile | 2 +-
nptl/Versions | 4 ++--
nptl/futex-internal.c | 4 ++--
sysdeps/nptl/futex-internal.h | 4 ++--
4 files changed, 7 insertions(+), 7 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)
diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h
index 4c192c99e3..969ab2bf4b 100644
--- a/sysdeps/nptl/futex-internal.h
+++ b/sysdeps/nptl/futex-internal.h
@@ -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
--
2.29.2
next prev parent reply other threads:[~2021-02-17 17:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 17:21 [PATCH 0/6] More libpthread removal preparations Florian Weimer
2021-02-17 17:21 ` [PATCH 1/6] nptl: Split libpthread-routines into one routine per line Florian Weimer
2021-02-22 14:23 ` Adhemerval Zanella
2021-02-17 17:21 ` [PATCH 2/6] nptl: Reformat Versions Florian Weimer
2021-02-22 16:31 ` Adhemerval Zanella
2021-02-17 17:21 ` [PATCH 3/6] nptl: Move futex-internal.c into main nptl directory Florian Weimer
2021-02-22 16:34 ` Adhemerval Zanella
2021-02-17 17:21 ` [PATCH 4/6] nptl: Move lowlevellock into libc Florian Weimer
2021-02-22 16:38 ` Adhemerval Zanella
2021-02-22 16:46 ` Florian Weimer
2021-02-17 17:21 ` Florian Weimer [this message]
2021-02-22 16:39 ` [PATCH 5/6] nptl: Move futex-internal " Adhemerval Zanella
2021-02-17 17:22 ` [PATCH 6/6] nptl: Move elision implementations " Florian Weimer
2021-02-22 16:53 ` Adhemerval Zanella
2021-02-22 17:02 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b81cb43366e3d6e2bb3268c2fd9341f2648b5626.1613582255.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).