summaryrefslogtreecommitdiffstats
path: root/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2007-11-19 15:35:12 +0000
committerCarmelo Amoroso <carmelo.amoroso@st.com>2007-11-19 15:35:12 +0000
commit414d8e5f2a73aff8e9404684571a65f85b27bf89 (patch)
tree879ac217d477f76cf965b244d98b383b663ff47b /libpthread/nptl/sysdeps/pthread/bits/libc-lock.h
parent381fb7688d356f03e35b9254796adb29c941532b (diff)
downloaduClibc-alpine-414d8e5f2a73aff8e9404684571a65f85b27bf89.tar.bz2
uClibc-alpine-414d8e5f2a73aff8e9404684571a65f85b27bf89.tar.xz
Synch nptl branch with SH port: as requested by sjhill for mips-ash4 merge
Diffstat (limited to 'libpthread/nptl/sysdeps/pthread/bits/libc-lock.h')
-rw-r--r--libpthread/nptl/sysdeps/pthread/bits/libc-lock.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h b/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h
index d043a0d2e..fb085f5be 100644
--- a/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h
+++ b/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h
@@ -409,6 +409,9 @@ extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer
/* Normal cleanup handling, based on C cleanup attribute. */
extern __inline void
+__libc_cleanup_routine (struct __pthread_cleanup_frame *f);
+
+extern __inline void
__libc_cleanup_routine (struct __pthread_cleanup_frame *f)
{
if (f->__do_it)
@@ -528,10 +531,11 @@ weak_extern (__pthread_key_create)
weak_extern (__pthread_setspecific)
weak_extern (__pthread_getspecific)
weak_extern (__pthread_once)
-weak_extern (__pthread_initialize)
weak_extern (__pthread_atfork)
+#ifdef SHARED
weak_extern (_pthread_cleanup_push_defer)
weak_extern (_pthread_cleanup_pop_restore)
+#endif
weak_extern (pthread_setcancelstate)
# else
# pragma weak __pthread_mutex_init
@@ -552,7 +556,6 @@ weak_extern (pthread_setcancelstate)
# pragma weak __pthread_setspecific
# pragma weak __pthread_getspecific
# pragma weak __pthread_once
-# pragma weak __pthread_initialize
# pragma weak __pthread_atfork
# pragma weak _pthread_cleanup_push_defer
# pragma weak _pthread_cleanup_pop_restore