nptl: mark symbols with libc forwarder hidden

Timo Teräs timo.teras at iki.fi
Wed Apr 14 17:01:33 UTC 2010


Add attribute_hidden to all symbols having libc forwarder. This prevents
recursive self calls which would happen if libc is before libpthread in
linking order: the forwarder functions would call itself via the function
table, since the libpthread symbols would get overwritten with libc ones.
This has not been a problem in glibc since there these symbols are marked
hidden with linker version-script. Since we don't use one, we need to mark
these explicitly.

Signed-off-by: Timo Teräs <timo.teras at iki.fi>

diff --git a/libpthread/nptl/cleanup_defer_compat.c b/libpthread/nptl/cleanup_defer_compat.c
index 8fd9b54..cc68893 100644
--- a/libpthread/nptl/cleanup_defer_compat.c
+++ b/libpthread/nptl/cleanup_defer_compat.c
@@ -21,6 +21,7 @@
 
 
 void
+attribute_hidden
 _pthread_cleanup_push_defer (
      struct _pthread_cleanup_buffer *buffer,
      void (*routine) (void *),
@@ -60,6 +61,7 @@ strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer)
 
 
 void
+attribute_hidden
 _pthread_cleanup_pop_restore (
      struct _pthread_cleanup_buffer *buffer,
      int execute)
diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c
index b651a3e..87c08fa 100644
--- a/libpthread/nptl/init.c
+++ b/libpthread/nptl/init.c
@@ -111,8 +111,8 @@ static const struct pthread_functions pthread_functions =
     .ptr___pthread_key_create = __pthread_key_create_internal,
     .ptr___pthread_getspecific = __pthread_getspecific_internal,
     .ptr___pthread_setspecific = __pthread_setspecific_internal,
-    .ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer,
-    .ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore,
+    .ptr__pthread_cleanup_push_defer = _pthread_cleanup_push_defer,
+    .ptr__pthread_cleanup_pop_restore = _pthread_cleanup_pop_restore,
     .ptr_nthreads = &__nptl_nthreads,
     .ptr___pthread_unwind = &__pthread_unwind,
     .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
diff --git a/libpthread/nptl/pt-cleanup.c b/libpthread/nptl/pt-cleanup.c
index f72ea26..619eb8b 100644
--- a/libpthread/nptl/pt-cleanup.c
+++ b/libpthread/nptl/pt-cleanup.c
@@ -23,6 +23,7 @@
 #include <jmpbuf-unwind.h>
 
 void
+attribute_hidden
 __pthread_cleanup_upto (__jmp_buf target, char *targetframe)
 {
   struct pthread *self = THREAD_SELF;
diff --git a/libpthread/nptl/pthread_attr_destroy.c b/libpthread/nptl/pthread_attr_destroy.c
index b8e6a37..16b7164 100644
--- a/libpthread/nptl/pthread_attr_destroy.c
+++ b/libpthread/nptl/pthread_attr_destroy.c
@@ -24,6 +24,7 @@
 #include "pthreadP.h"
 
 int
+attribute_hidden
 __pthread_attr_destroy (
      pthread_attr_t *attr)
 {
diff --git a/libpthread/nptl/pthread_attr_getdetachstate.c b/libpthread/nptl/pthread_attr_getdetachstate.c
index 5f549ba..14b91df 100644
--- a/libpthread/nptl/pthread_attr_getdetachstate.c
+++ b/libpthread/nptl/pthread_attr_getdetachstate.c
@@ -22,6 +22,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_getdetachstate (
      const pthread_attr_t *attr,
      int *detachstate)
diff --git a/libpthread/nptl/pthread_attr_getinheritsched.c b/libpthread/nptl/pthread_attr_getinheritsched.c
index 3ff3040..8ab8657 100644
--- a/libpthread/nptl/pthread_attr_getinheritsched.c
+++ b/libpthread/nptl/pthread_attr_getinheritsched.c
@@ -22,6 +22,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_getinheritsched (
      const pthread_attr_t *attr,
      int *inherit)
diff --git a/libpthread/nptl/pthread_attr_getschedparam.c b/libpthread/nptl/pthread_attr_getschedparam.c
index 82b2371..ee1d513 100644
--- a/libpthread/nptl/pthread_attr_getschedparam.c
+++ b/libpthread/nptl/pthread_attr_getschedparam.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_getschedparam (
         const pthread_attr_t *attr,
         struct sched_param *param)
diff --git a/libpthread/nptl/pthread_attr_getschedpolicy.c b/libpthread/nptl/pthread_attr_getschedpolicy.c
index 7b8f1de..54666da 100644
--- a/libpthread/nptl/pthread_attr_getschedpolicy.c
+++ b/libpthread/nptl/pthread_attr_getschedpolicy.c
@@ -22,6 +22,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_getschedpolicy (
      const pthread_attr_t *attr,
      int *policy)
diff --git a/libpthread/nptl/pthread_attr_getscope.c b/libpthread/nptl/pthread_attr_getscope.c
index 9b05ffa..ccbebfa 100644
--- a/libpthread/nptl/pthread_attr_getscope.c
+++ b/libpthread/nptl/pthread_attr_getscope.c
@@ -22,6 +22,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_getscope (
      const pthread_attr_t *attr,
      int *scope)
diff --git a/libpthread/nptl/pthread_attr_init.c b/libpthread/nptl/pthread_attr_init.c
index 65ce4e5..d019514 100644
--- a/libpthread/nptl/pthread_attr_init.c
+++ b/libpthread/nptl/pthread_attr_init.c
@@ -29,6 +29,7 @@ int __attr_list_lock = LLL_LOCK_INITIALIZER;
 
 
 int
+attribute_hidden
 __pthread_attr_init_2_1 (
      pthread_attr_t *attr)
 {
diff --git a/libpthread/nptl/pthread_attr_setdetachstate.c b/libpthread/nptl/pthread_attr_setdetachstate.c
index b6d9bb5..d72fd83 100644
--- a/libpthread/nptl/pthread_attr_setdetachstate.c
+++ b/libpthread/nptl/pthread_attr_setdetachstate.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
 {
   struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setinheritsched.c b/libpthread/nptl/pthread_attr_setinheritsched.c
index 9d0234a..d340df2 100644
--- a/libpthread/nptl/pthread_attr_setinheritsched.c
+++ b/libpthread/nptl/pthread_attr_setinheritsched.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_setinheritsched (
      pthread_attr_t *attr,
      int inherit)
diff --git a/libpthread/nptl/pthread_attr_setschedparam.c b/libpthread/nptl/pthread_attr_setschedparam.c
index 741e641..aa71400 100644
--- a/libpthread/nptl/pthread_attr_setschedparam.c
+++ b/libpthread/nptl/pthread_attr_setschedparam.c
@@ -24,6 +24,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_setschedparam (
      pthread_attr_t *attr,
      const struct sched_param *param)
diff --git a/libpthread/nptl/pthread_attr_setschedpolicy.c b/libpthread/nptl/pthread_attr_setschedpolicy.c
index 1d87b53..055890b 100644
--- a/libpthread/nptl/pthread_attr_setschedpolicy.c
+++ b/libpthread/nptl/pthread_attr_setschedpolicy.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_setschedpolicy (
      pthread_attr_t *attr,
      int policy)
diff --git a/libpthread/nptl/pthread_attr_setscope.c b/libpthread/nptl/pthread_attr_setscope.c
index cc4e467..8155bea 100644
--- a/libpthread/nptl/pthread_attr_setscope.c
+++ b/libpthread/nptl/pthread_attr_setscope.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_attr_setscope (
      pthread_attr_t *attr,
      int scope)
diff --git a/libpthread/nptl/pthread_cond_destroy.c b/libpthread/nptl/pthread_cond_destroy.c
index b67b535..6f13d97 100644
--- a/libpthread/nptl/pthread_cond_destroy.c
+++ b/libpthread/nptl/pthread_cond_destroy.c
@@ -22,6 +22,7 @@
 
 
 int
+attribute_hidden
 __pthread_cond_destroy (
      pthread_cond_t *cond)
 {
diff --git a/libpthread/nptl/pthread_cond_init.c b/libpthread/nptl/pthread_cond_init.c
index dec6444..e7a18e4 100644
--- a/libpthread/nptl/pthread_cond_init.c
+++ b/libpthread/nptl/pthread_cond_init.c
@@ -22,6 +22,7 @@
 
 
 int
+attribute_hidden
 __pthread_cond_init (
      pthread_cond_t *cond,
      const pthread_condattr_t *cond_attr)
diff --git a/libpthread/nptl/pthread_condattr_destroy.c b/libpthread/nptl/pthread_condattr_destroy.c
index bdb6441..b0da060 100644
--- a/libpthread/nptl/pthread_condattr_destroy.c
+++ b/libpthread/nptl/pthread_condattr_destroy.c
@@ -21,6 +21,7 @@
 
 
 int
+attribute_hidden
 __pthread_condattr_destroy (pthread_condattr_t *attr)
 {
   /* Nothing to be done.  */
diff --git a/libpthread/nptl/pthread_condattr_init.c b/libpthread/nptl/pthread_condattr_init.c
index d22ca1e..05ab6a2 100644
--- a/libpthread/nptl/pthread_condattr_init.c
+++ b/libpthread/nptl/pthread_condattr_init.c
@@ -22,6 +22,7 @@
 
 
 int
+attribute_hidden
 __pthread_condattr_init (pthread_condattr_t *attr)
 {
   memset (attr, '\0', sizeof (*attr));
diff --git a/libpthread/nptl/pthread_create.c b/libpthread/nptl/pthread_create.c
index 8b53cb1..0825873 100644
--- a/libpthread/nptl/pthread_create.c
+++ b/libpthread/nptl/pthread_create.c
@@ -44,7 +44,7 @@ static td_thr_events_t __nptl_threads_events __attribute_used__;
 static struct pthread *__nptl_last_event __attribute_used__;
 
 /* Number of threads running.  */
-unsigned int __nptl_nthreads = 1;
+unsigned int attribute_hidden __nptl_nthreads = 1;
 
 
 /* Code to allocate and deallocate a stack.  */
diff --git a/libpthread/nptl/pthread_equal.c b/libpthread/nptl/pthread_equal.c
index 8587e0f..4c9a24c 100644
--- a/libpthread/nptl/pthread_equal.c
+++ b/libpthread/nptl/pthread_equal.c
@@ -21,6 +21,7 @@
 
 
 int
+attribute_hidden
 __pthread_equal (pthread_t thread1, pthread_t thread2)
 {
   return thread1 == thread2;
diff --git a/libpthread/nptl/pthread_exit.c b/libpthread/nptl/pthread_exit.c
index a8c92fd..de43cb8 100644
--- a/libpthread/nptl/pthread_exit.c
+++ b/libpthread/nptl/pthread_exit.c
@@ -22,6 +22,7 @@
 
 
 void
+attribute_hidden
 __pthread_exit (void* value)
 {
   THREAD_SETMEM (THREAD_SELF, result, value);
diff --git a/libpthread/nptl/pthread_getschedparam.c b/libpthread/nptl/pthread_getschedparam.c
index bb5f0a9..9c6ea27 100644
--- a/libpthread/nptl/pthread_getschedparam.c
+++ b/libpthread/nptl/pthread_getschedparam.c
@@ -24,6 +24,7 @@
 
 
 int
+attribute_hidden
 __pthread_getschedparam (
      pthread_t threadid,
      int *policy,
diff --git a/libpthread/nptl/pthread_getspecific.c b/libpthread/nptl/pthread_getspecific.c
index 62c48fe..183595c 100644
--- a/libpthread/nptl/pthread_getspecific.c
+++ b/libpthread/nptl/pthread_getspecific.c
@@ -22,6 +22,7 @@
 
 
 void *
+attribute_hidden
 __pthread_getspecific (pthread_key_t key)
 {
   struct pthread_key_data *data;
diff --git a/libpthread/nptl/pthread_key_create.c b/libpthread/nptl/pthread_key_create.c
index 3744c08..21f60ad 100644
--- a/libpthread/nptl/pthread_key_create.c
+++ b/libpthread/nptl/pthread_key_create.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_key_create (
      pthread_key_t *key,
      void (*destr) (void *))
diff --git a/libpthread/nptl/pthread_mutex_destroy.c b/libpthread/nptl/pthread_mutex_destroy.c
index f487d61..5207433 100644
--- a/libpthread/nptl/pthread_mutex_destroy.c
+++ b/libpthread/nptl/pthread_mutex_destroy.c
@@ -22,6 +22,7 @@
 
 
 int
+attribute_hidden
 __pthread_mutex_destroy (
      pthread_mutex_t *mutex)
 {
diff --git a/libpthread/nptl/pthread_mutex_init.c b/libpthread/nptl/pthread_mutex_init.c
index dd6e6d6..fee82cc 100644
--- a/libpthread/nptl/pthread_mutex_init.c
+++ b/libpthread/nptl/pthread_mutex_init.c
@@ -37,6 +37,7 @@ static int tpi_supported;
 
 
 int
+attribute_hidden
 __pthread_mutex_init (
      pthread_mutex_t *mutex,
      const pthread_mutexattr_t *mutexattr)
diff --git a/libpthread/nptl/pthread_mutex_lock.c b/libpthread/nptl/pthread_mutex_lock.c
index 47e4d41..d00e135 100644
--- a/libpthread/nptl/pthread_mutex_lock.c
+++ b/libpthread/nptl/pthread_mutex_lock.c
@@ -42,6 +42,7 @@ static int __pthread_mutex_lock_full (pthread_mutex_t *mutex)
 
 
 int
+attribute_hidden
 __pthread_mutex_lock (
      pthread_mutex_t *mutex)
 {
diff --git a/libpthread/nptl/pthread_mutex_unlock.c b/libpthread/nptl/pthread_mutex_unlock.c
index f164cde..15a5d1d 100644
--- a/libpthread/nptl/pthread_mutex_unlock.c
+++ b/libpthread/nptl/pthread_mutex_unlock.c
@@ -284,6 +284,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
 
 
 int
+attribute_hidden
 __pthread_mutex_unlock (
      pthread_mutex_t *mutex)
 {
diff --git a/libpthread/nptl/pthread_self.c b/libpthread/nptl/pthread_self.c
index f0e3b3f..61cb2a7 100644
--- a/libpthread/nptl/pthread_self.c
+++ b/libpthread/nptl/pthread_self.c
@@ -22,6 +22,7 @@
 
 
 pthread_t
+attribute_hidden
 __pthread_self (void)
 {
   return (pthread_t) THREAD_SELF;
diff --git a/libpthread/nptl/pthread_setcancelstate.c b/libpthread/nptl/pthread_setcancelstate.c
index e53b52d..0da9a74 100644
--- a/libpthread/nptl/pthread_setcancelstate.c
+++ b/libpthread/nptl/pthread_setcancelstate.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_setcancelstate (
      int state,
      int *oldstate)
diff --git a/libpthread/nptl/pthread_setcanceltype.c b/libpthread/nptl/pthread_setcanceltype.c
index 47c104b..3cb7235 100644
--- a/libpthread/nptl/pthread_setcanceltype.c
+++ b/libpthread/nptl/pthread_setcanceltype.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_setcanceltype (
      int type,
      int *oldtype)
diff --git a/libpthread/nptl/pthread_setschedparam.c b/libpthread/nptl/pthread_setschedparam.c
index 9b33b3e..dabcb7c 100644
--- a/libpthread/nptl/pthread_setschedparam.c
+++ b/libpthread/nptl/pthread_setschedparam.c
@@ -25,6 +25,7 @@
 
 
 int
+attribute_hidden
 __pthread_setschedparam (
      pthread_t threadid,
      int policy,
diff --git a/libpthread/nptl/pthread_setspecific.c b/libpthread/nptl/pthread_setspecific.c
index 8e24be7..0f24d68 100644
--- a/libpthread/nptl/pthread_setspecific.c
+++ b/libpthread/nptl/pthread_setspecific.c
@@ -23,6 +23,7 @@
 
 
 int
+attribute_hidden
 __pthread_setspecific (
      pthread_key_t key,
      const void *value)
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c
index 5e74657..04cfc3a 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c
@@ -28,6 +28,7 @@
 
 
 int
+attribute_hidden
 __pthread_cond_broadcast (
      pthread_cond_t *cond)
 {
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c
index d66f3ed..aa6d108 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c
@@ -28,6 +28,7 @@
 
 
 int
+attribute_hidden
 __pthread_cond_signal (
      pthread_cond_t *cond)
 {
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c
index 4aaf5df..88aa0db 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c
@@ -39,6 +39,7 @@ struct _condvar_cleanup_buffer
 };
 
 int
+attribute_hidden
 __pthread_cond_timedwait (
      pthread_cond_t *cond,
      pthread_mutex_t *mutex,
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c
index 2fac02d..ad04f15 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c
@@ -89,6 +89,7 @@ __condvar_cleanup (void *arg)
 
 
 int
+attribute_hidden
 __pthread_cond_wait (
      pthread_cond_t *cond,
      pthread_mutex_t *mutex)
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_rwlock_rdlock.c b/libpthread/nptl/sysdeps/pthread/pthread_rwlock_rdlock.c
index dc00f2a..af2adb3 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_rwlock_rdlock.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_rwlock_rdlock.c
@@ -26,6 +26,7 @@
 
 /* Acquire read lock for RWLOCK.  */
 int
+attribute_hidden
 __pthread_rwlock_rdlock (
      pthread_rwlock_t *rwlock)
 {
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_rwlock_unlock.c b/libpthread/nptl/sysdeps/pthread/pthread_rwlock_unlock.c
index a7ef71a..510395e 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_rwlock_unlock.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_rwlock_unlock.c
@@ -25,6 +25,7 @@
 
 /* Unlock RWLOCK.  */
 int
+attribute_hidden
 __pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
 {
   lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c b/libpthread/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c
index 81e6daa..63eed0b 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c
@@ -26,6 +26,7 @@
 
 /* Acquire write lock for RWLOCK.  */
 int
+attribute_hidden
 __pthread_rwlock_wrlock (
      pthread_rwlock_t *rwlock)
 {
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c
index 0e7e979..7edee66 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c
@@ -32,6 +32,7 @@ clear_once_control (void *arg)
 }
 
 int
+attribute_hidden
 __pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
 {
   for (;;)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/pthread_once.c
index d81ecd4..a482ddc 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/pthread_once.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/pthread_once.c
@@ -31,6 +31,7 @@ clear_once_control (void *arg)
 }
 
 int
+attribute_hidden
 __pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
 {
   for (;;)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
index 0413cc1..37dd9da 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
@@ -30,6 +30,7 @@
 	/* int pthread_cond_broadcast (pthread_cond_t *cond) */
 	.globl	__pthread_cond_broadcast
 	.type	__pthread_cond_broadcast, @function
+	.hidden	__pthread_cond_broadcast
 	.align	16
 __pthread_cond_broadcast:
 	cfi_startproc
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
index 2f3c9bc..64d309d 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
@@ -31,6 +31,7 @@
 	/* int pthread_cond_signal (pthread_cond_t *cond) */
 	.globl	__pthread_cond_signal
 	.type	__pthread_cond_signal, @function
+	.hidden	__pthread_cond_signal
 	.align	16
 __pthread_cond_signal:
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index c56dd77..6646c8a 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -31,6 +31,7 @@
 			       const struct timespec *abstime)  */
 	.globl	__pthread_cond_timedwait
 	.type	__pthread_cond_timedwait, @function
+	.hidden	__pthread_cond_timedwait
 	.align	16
 __pthread_cond_timedwait:
 .LSTARTCODE:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
index 6261805..137d576 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
@@ -31,6 +31,7 @@
 /* int pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)  */
 	.globl	__pthread_cond_wait
 	.type	__pthread_cond_wait, @function
+	.hidden	__pthread_cond_wait
 	.align	16
 __pthread_cond_wait:
 .LSTARTCODE:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
index 6205a60..5707713 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
@@ -29,6 +29,7 @@
 
 	.globl	__pthread_rwlock_rdlock
 	.type	__pthread_rwlock_rdlock, at function
+	.hidden	__pthread_rwlock_rdlock
 	.align	16
 __pthread_rwlock_rdlock:
 	cfi_startproc
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
index 426ffdc..7256301 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
@@ -28,6 +28,7 @@
 
 	.globl	__pthread_rwlock_unlock
 	.type	__pthread_rwlock_unlock, at function
+	.hidden	__pthread_rwlock_unlock
 	.align	16
 __pthread_rwlock_unlock:
 	cfi_startproc
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
index 0414ba0..8ff7dfa 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
@@ -29,6 +29,7 @@
 
 	.globl	__pthread_rwlock_wrlock
 	.type	__pthread_rwlock_wrlock, at function
+	.hidden	__pthread_rwlock_wrlock
 	.align	16
 __pthread_rwlock_wrlock:
 	cfi_startproc
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
index 409df15..a995709 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
@@ -31,6 +31,7 @@
 
 	.globl	__pthread_once
 	.type	__pthread_once, at function
+	.hidden	__pthread_once
 	.align	16
 	cfi_startproc
 __pthread_once:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/pthread_once.c
index ddfd32b..f7b940f 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/pthread_once.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/pthread_once.c
@@ -35,6 +35,7 @@ clear_once_control (void *arg)
 
 
 int
+attribute_hidden
 __pthread_once (once_control, init_routine)
      pthread_once_t *once_control;
      void (*init_routine) (void);
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c
index 9690780..5f4b7e9 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c
@@ -35,6 +35,7 @@ clear_once_control (void *arg)
 
 
 int
+attribute_hidden
 __pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
 {
   for (;;)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
index 1242fc2..0884c13 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
@@ -30,6 +30,7 @@
 	/* int pthread_cond_broadcast (pthread_cond_t *cond) */
 	.globl	__pthread_cond_broadcast
 	.type	__pthread_cond_broadcast, @function
+	.hidden	__pthread_cond_broadcast
 	.align	5
 __pthread_cond_broadcast:
 	mov.l   r10, @-r15
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
index 1c3bacb..d2d7c19 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
@@ -29,6 +29,7 @@
 	/* int pthread_cond_signal (pthread_cond_t *cond) */
 	.globl	__pthread_cond_signal
 	.type	__pthread_cond_signal, @function
+	.hidden	__pthread_cond_signal
 	.align	5
 __pthread_cond_signal:
 	mov.l	r8, @-r15
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
index 3e11756..7db789f 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
@@ -30,6 +30,7 @@
 			       const struct timespec *abstime)  */
 	.globl	__pthread_cond_timedwait
 	.type	__pthread_cond_timedwait, @function
+	.hidden	__pthread_cond_timedwait
 	.align	5
 __pthread_cond_timedwait:
 .LSTARTCODE:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
index 5a897f6..f4f22b6 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
@@ -28,6 +28,7 @@
 /* int pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)  */
 	.globl	__pthread_cond_wait
 	.type	__pthread_cond_wait, @function
+	.hidden	__pthread_cond_wait
 	.align	5
 __pthread_cond_wait:
 .LSTARTCODE:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
index a1477b3..da6ecfb 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
@@ -29,6 +29,7 @@
 	.text
 	.globl	__pthread_once
 	.type	__pthread_once, at function
+	.hidden	__pthread_once
 	.align	5
 	cfi_startproc
 __pthread_once:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
index 52fe5de..5b100d8 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
@@ -29,6 +29,7 @@
 
 	.globl	__pthread_rwlock_rdlock
 	.type	__pthread_rwlock_rdlock, at function
+	.hidden	__pthread_rwlock_rdlock
 	.align	5
 __pthread_rwlock_rdlock:
 	mov.l	r12, @-r15
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
index bc6c6c2..ca7a692 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
@@ -28,6 +28,7 @@
 
 	.globl	__pthread_rwlock_unlock
 	.type	__pthread_rwlock_unlock, at function
+	.hidden	__pthread_rwlock_unlock
 	.align	5
 __pthread_rwlock_unlock:
 	mov.l	r12, @-r15
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
index 3d37fb4..fa051b1 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
@@ -29,6 +29,7 @@
 
 	.globl	__pthread_rwlock_wrlock
 	.type	__pthread_rwlock_wrlock, at function
+	.hidden	__pthread_rwlock_wrlock
 	.align	5
 __pthread_rwlock_wrlock:
 	mov.l	r12, @-r15
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c
index 22e2dd3..a6a470c 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c
@@ -35,6 +35,7 @@ clear_once_control (void *arg)
 
 
 int
+attribute_hidden
 __pthread_once (once_control, init_routine)
      pthread_once_t *once_control;
      void (*init_routine) (void);
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
index 0f8037b..523bfdb 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
@@ -31,6 +31,7 @@
 	/* int pthread_cond_broadcast (pthread_cond_t *cond) */
 	.globl	__pthread_cond_broadcast
 	.type	__pthread_cond_broadcast, @function
+	.hidden	__pthread_cond_broadcast
 	.align	16
 __pthread_cond_broadcast:
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
index 568c984..cb1eb57 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
@@ -30,6 +30,7 @@
 	/* int pthread_cond_signal (pthread_cond_t *cond) */
 	.globl	__pthread_cond_signal
 	.type	__pthread_cond_signal, @function
+	.hidden	__pthread_cond_signal
 	.align	16
 __pthread_cond_signal:
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
index bc5c0b3..7365b5c 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
@@ -36,6 +36,7 @@
 			       const struct timespec *abstime)  */
 	.globl	__pthread_cond_timedwait
 	.type	__pthread_cond_timedwait, @function
+	.hidden	__pthread_cond_timedwait
 	.align	16
 __pthread_cond_timedwait:
 .LSTARTCODE:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
index a44e7a7..45ce84e 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
@@ -31,6 +31,7 @@
 /* int pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)  */
 	.globl	__pthread_cond_wait
 	.type	__pthread_cond_wait, @function
+	.hidden	__pthread_cond_wait
 	.align	16
 __pthread_cond_wait:
 .LSTARTCODE:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
index a808b9d..b0e3516 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
@@ -30,6 +30,7 @@
 
 	.globl	__pthread_once
 	.type	__pthread_once, at function
+	.hidden	__pthread_once
 	.align	16
 __pthread_once:
 .LSTARTCODE:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
index f36e7a7..2d42ec1 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
@@ -29,6 +29,7 @@
 
 	.globl	__pthread_rwlock_rdlock
 	.type	__pthread_rwlock_rdlock, at function
+	.hidden	__pthread_rwlock_rdlock
 	.align	16
 __pthread_rwlock_rdlock:
 	cfi_startproc
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
index cfcc7a1..c274113 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
@@ -27,6 +27,7 @@
 
 	.globl	__pthread_rwlock_unlock
 	.type	__pthread_rwlock_unlock, at function
+	.hidden	__pthread_rwlock_unlock
 	.align	16
 __pthread_rwlock_unlock:
 	cfi_startproc
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
index ccfc11b..182745e 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
@@ -29,6 +29,7 @@
 
 	.globl	__pthread_rwlock_wrlock
 	.type	__pthread_rwlock_wrlock, at function
+	.hidden	__pthread_rwlock_wrlock
 	.align	16
 __pthread_rwlock_wrlock:
 	cfi_startproc
diff --git a/libpthread/nptl/unwind.c b/libpthread/nptl/unwind.c
index 9a35695..d1f8241 100644
--- a/libpthread/nptl/unwind.c
+++ b/libpthread/nptl/unwind.c
@@ -115,6 +115,7 @@ unwind_cleanup (_Unwind_Reason_Code reason, struct _Unwind_Exception *exc)
 
 
 void
+attribute_hidden
 __cleanup_fct_attribute __attribute ((noreturn))
 __pthread_unwind (__pthread_unwind_buf_t *buf)
 {


More information about the uClibc mailing list