From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed, 17 Feb 2021 14:10:52 +0000 (-0300)
Subject: nptl: Fix __pthread_clockjoin_np64 __pthread_timedjoin_np64 hidden proto
X-Git-Tag: glibc-2.34~877
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bb0d2fe0a15ae69f0c351bd2b83a737b8da771f;p=thirdparty%2Fglibc.git

nptl: Fix __pthread_clockjoin_np64 __pthread_timedjoin_np64 hidden proto

They are both implemented in libpthread instead of libc.
---

diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 93f3cef00fc..c8538de44fb 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -469,10 +469,10 @@ extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
 extern int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return,
                                      clockid_t clockid,
                                      const struct __timespec64 *abstime);
-libc_hidden_proto (__pthread_clockjoin_np64)
+libpthread_hidden_proto (__pthread_clockjoin_np64)
 extern int __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return,
                                      const struct __timespec64 *abstime);
-libc_hidden_proto (__pthread_timedjoin_np64)
+libpthread_hidden_proto (__pthread_timedjoin_np64)
 extern int __pthread_cond_timedwait64 (pthread_cond_t *cond,
                                        pthread_mutex_t *mutex,
                                        const struct __timespec64 *abstime);
diff --git a/nptl/pthread_clockjoin.c b/nptl/pthread_clockjoin.c
index c55ab8bd092..7457c187fed 100644
--- a/nptl/pthread_clockjoin.c
+++ b/nptl/pthread_clockjoin.c
@@ -32,7 +32,7 @@ __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return,
 }
 
 #if __TIMESIZE != 64
-libc_hidden_def (__pthread_clockjoin_np64)
+libpthread_hidden_def (__pthread_clockjoin_np64)
 
 int
 __pthread_clockjoin_np (pthread_t threadid, void **thread_return,
diff --git a/nptl/pthread_timedjoin.c b/nptl/pthread_timedjoin.c
index 282483cc49d..f5d0d3d6ce6 100644
--- a/nptl/pthread_timedjoin.c
+++ b/nptl/pthread_timedjoin.c
@@ -28,7 +28,7 @@ __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return,
 }
 
 #if __TIMESIZE != 64
-libc_hidden_def (__pthread_timedjoin_np64)
+libpthread_hidden_def (__pthread_timedjoin_np64)
 
 int
 __pthread_timedjoin_np (pthread_t threadid, void **thread_return,