diff mbox series

[5/6] nptl: Move futex-internal into libc

Message ID b81cb43366e3d6e2bb3268c2fd9341f2648b5626.1613582255.git.fweimer@redhat.com
State New
Headers show
Series More libpthread removal preparations | expand

Commit Message

Florian Weimer Feb. 17, 2021, 5:21 p.m. UTC
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(-)

Comments

Adhemerval Zanella Feb. 22, 2021, 4:39 p.m. UTC | #1
On 17/02/2021 14:21, Florian Weimer via Libc-alpha wrote:
> This moves  __futex_abstimed_wait64 and
> __futex_abstimed_wait_cancelable64 and exports these functions as
> GLIBC_PRIVATE.


LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  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 \

Ok.

> 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;

Ok.

> @@ -387,8 +389,6 @@ libpthread {
>    }
>  
>    GLIBC_PRIVATE {
> -    __futex_abstimed_wait64;
> -    __futex_abstimed_wait_cancelable64;
>      __libpthread_freeres;
>      __pthread_barrier_init;
>      __pthread_barrier_wait;

Ok.

> 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)

Ok.

> 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
> 

Ok.
diff mbox series

Patch

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