Finally check in all the changes I made for NPTL library proper.

1 files changed, 15 insertions, 11 deletions

diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h
index da278bdb8..45222f45e 100644
--- a/libpthread/nptl/pthreadP.h
+++ b/libpthread/nptl/pthreadP.h
@@ -66,7 +66,7 @@ extern int __is_smp attribute_hidden;
 
 /* Thread descriptor handling.  */
 extern list_t __stack_user;
-hidden_def(__stack_user)
+hidden_proto (__stack_user)
 
 /* Attribute handling.  */
 extern struct pthread_attr *__attr_list attribute_hidden;
@@ -82,7 +82,7 @@ extern int __concurrency_level attribute_hidden;
 
 /* Thread-local data key handling.  */
 extern struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX];
-hidden_def(__pthread_keys)
+hidden_proto (__pthread_keys)
 
 /* Number of threads running.  */
 extern unsigned int __nptl_nthreads attribute_hidden;
@@ -134,6 +134,10 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
 extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
      __cleanup_fct_attribute;
 #if defined NOT_IN_libc && defined IS_IN_libpthread
+hidden_proto (__pthread_unwind)
+hidden_proto (__pthread_unwind_next)
+hidden_proto (__pthread_register_cancel)
+hidden_proto (__pthread_unregister_cancel)
 # ifdef SHARED
 extern void attribute_hidden pthread_cancel_init (void);
 # endif
@@ -170,22 +174,22 @@ __do_cancel (void)
 # define LIBC_CANCEL_RESET(oldtype) \
   __libc_disable_asynccancel (oldtype)
 # define LIBC_CANCEL_HANDLED() \
-  __asm (".globl " __C_SYMBOL_PREFIX__ "__libc_enable_asynccancel"); \
-  __asm (".globl " __C_SYMBOL_PREFIX__ "__libc_disable_asynccancel")
+  __asm (".globl " __USER_LABEL_PREFIX__ "__libc_enable_asynccancel"); \
+  __asm (".globl " __USER_LABEL_PREFIX__ "__libc_disable_asynccancel")
 #elif defined NOT_IN_libc && defined IS_IN_libpthread
 # define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
 # define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
 # define LIBC_CANCEL_HANDLED() \
-  __asm (".globl " __C_SYMBOL_PREFIX__ "__pthread_enable_asynccancel"); \
-  __asm (".globl " __C_SYMBOL_PREFIX__ "__pthread_disable_asynccancel")
+  __asm (".globl " __USER_LABEL_PREFIX__ "__pthread_enable_asynccancel"); \
+  __asm (".globl " __USER_LABEL_PREFIX__ "__pthread_disable_asynccancel")
 #elif defined NOT_IN_libc && defined IS_IN_librt
 # define LIBC_CANCEL_ASYNC() \
   __librt_enable_asynccancel ()
 # define LIBC_CANCEL_RESET(val) \
   __librt_disable_asynccancel (val)
 # define LIBC_CANCEL_HANDLED() \
-  __asm (".globl " __C_SYMBOL_PREFIX__ "__librt_enable_asynccancel"); \
-  __asm (".globl " __C_SYMBOL_PREFIX__ "__librt_disable_asynccancel")
+  __asm (".globl " __USER_LABEL_PREFIX__ "__librt_enable_asynccancel"); \
+  __asm (".globl " __USER_LABEL_PREFIX__ "__librt_disable_asynccancel")
 #else
 # define LIBC_CANCEL_ASYNC()	0 /* Just a dummy value.  */
 # define LIBC_CANCEL_RESET(val)	((void)(val)) /* Nothing, but evaluate it.  */
@@ -234,7 +238,7 @@ extern int __make_stacks_executable (void **stack_endp)
 /* longjmp handling.  */
 extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
 #if defined NOT_IN_libc && defined IS_IN_libpthread
-hidden_def(__pthread_cleanup_upto)
+hidden_proto (__pthread_cleanup_upto)
 #endif
 
 
@@ -252,8 +256,8 @@ extern int __pthread_attr_init_2_0 (pthread_attr_t *attr);
 /* Event handlers for libthread_db interface.  */
 extern void __nptl_create_event (void);
 extern void __nptl_death_event (void);
-hidden_def(__nptl_create_event)
-hidden_def(__nptl_death_event)
+hidden_proto (__nptl_create_event)
+hidden_proto (__nptl_death_event)
 
 /* Register the generation counter in the libpthread with the libc.  */
 #ifdef TLS_MULTIPLE_THREADS_IN_TCB