From a501a33e9761f32b3d38ab9f113892abe7cef3f1 Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Fri, 16 Apr 2010 16:56:00 +0300 Subject: nptl: mark forwarded functions protected The libc stubs should never override the libpthread provided functions inside libpthread, otherwise the struct pthread_functions that is used by the forwarder stubs goes bad. Signed-off-by: Timo Teras Signed-off-by: Austin Foxley --- libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S | 1 + libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S | 1 + libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S | 1 + libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S | 1 + libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S | 1 + libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S | 1 + libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S | 1 + libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S | 1 + 8 files changed, 8 insertions(+) (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/sh') 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 1242fc2cc..233183177 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 + .protected __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 1c3bacbe6..ca87336d9 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 + .protected __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 3e117564f..cacb037d8 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 + .protected __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 5a897f6fe..b0a4e9888 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 + .protected __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 a1477b3ac..46234459a 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,@function + .protected __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 52fe5de10..21e05e192 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,@function + .protected __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 bc6c6c233..1f6c1d812 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,@function + .protected __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 3d37fb486..e7bfe0d09 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,@function + .protected __pthread_rwlock_wrlock .align 5 __pthread_rwlock_wrlock: mov.l r12, @-r15 -- cgit v1.2.3