diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/allocatestack.c | 32 | ||||
| -rw-r--r-- | nptl/pthreadP.h | 9 | ||||
| -rw-r--r-- | nptl/pthread_cancel.c | 7 | ||||
| -rw-r--r-- | nptl/pthread_create.c | 18 | ||||
| -rw-r--r-- | nptl/pthread_detach.c | 3 | ||||
| -rw-r--r-- | nptl/pthread_equal.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_exit.c | 4 | ||||
| -rw-r--r-- | nptl/pthread_getspecific.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_join.c | 3 | ||||
| -rw-r--r-- | nptl/pthread_key_create.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_key_delete.c | 3 | ||||
| -rw-r--r-- | nptl/pthread_mutex_destroy.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_mutex_init.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_mutex_lock.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_mutex_timedlock.c | 5 | ||||
| -rw-r--r-- | nptl/pthread_mutex_trylock.c | 3 | ||||
| -rw-r--r-- | nptl/pthread_mutex_unlock.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_mutexattr_init.c | 3 | ||||
| -rw-r--r-- | nptl/pthread_mutexattr_settype.c | 3 | ||||
| -rw-r--r-- | nptl/pthread_self.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_setspecific.c | 2 | ||||
| -rw-r--r-- | nptl/tpp.c | 4 |
22 files changed, 66 insertions, 49 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 8364406b1b..ec7d42e027 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -278,7 +278,7 @@ __free_stacks (size_t limit) /* Remove this block. This should never fail. If it does something is really wrong. */ - if (munmap (curr->stackblock, curr->stackblock_size) != 0) + if (__munmap (curr->stackblock, curr->stackblock_size) != 0) abort (); /* Maybe we have freed enough. */ @@ -328,7 +328,7 @@ change_stack_perm (struct pthread *pd #else # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" #endif - if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0) + if (__mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0) return errno; return 0; @@ -359,14 +359,14 @@ setup_stack_prot (char *mem, size_t size, char *guard, size_t guardsize, #if _STACK_GROWS_DOWN /* As defined at guard_position, for architectures with downward stack the guard page is always at start of the allocated area. */ - if (mprotect (guardend, size - guardsize, prot) != 0) + if (__mprotect (guardend, size - guardsize, prot) != 0) return errno; #else size_t mprots1 = (uintptr_t) guard - (uintptr_t) mem; - if (mprotect (mem, mprots1, prot) != 0) + if (__mprotect (mem, mprots1, prot) != 0) return errno; size_t mprots2 = ((uintptr_t) mem + size) - (uintptr_t) guardend; - if (mprotect (guardend, mprots2, prot) != 0) + if (__mprotect (guardend, mprots2, prot) != 0) return errno; #endif return 0; @@ -530,8 +530,8 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, /* If a guard page is required, avoid committing memory by first allocate with PROT_NONE and then reserve with required permission excluding the guard page. */ - mem = mmap (NULL, size, (guardsize == 0) ? prot : PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0); + mem = __mmap (NULL, size, (guardsize == 0) ? prot : PROT_NONE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0); if (__glibc_unlikely (mem == MAP_FAILED)) return errno; @@ -557,7 +557,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, pagesize_m1); if (setup_stack_prot (mem, size, guard, guardsize, prot) != 0) { - munmap (mem, size); + __munmap (mem, size); return errno; } } @@ -600,7 +600,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, assert (errno == ENOMEM); /* Free the stack memory we just allocated. */ - (void) munmap (mem, size); + (void) __munmap (mem, size); return errno; } @@ -630,7 +630,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, if (err != 0) { /* Free the stack memory we just allocated. */ - (void) munmap (mem, size); + (void) __munmap (mem, size); return err; } @@ -650,7 +650,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, { char *guard = guard_position (mem, size, guardsize, pd, pagesize_m1); - if (mprotect (guard, guardsize, PROT_NONE) != 0) + if (__mprotect (guard, guardsize, PROT_NONE) != 0) { mprot_error: lll_lock (stack_cache_lock, LLL_PRIVATE); @@ -668,7 +668,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, of memory caused problems we better do not use it anymore. Uh, and we ignore possible errors. There is nothing we could do. */ - (void) munmap (mem, size); + (void) __munmap (mem, size); return errno; } @@ -685,19 +685,19 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, char *oldguard = mem + (((size - pd->guardsize) / 2) & ~pagesize_m1); if (oldguard < guard - && mprotect (oldguard, guard - oldguard, prot) != 0) + && __mprotect (oldguard, guard - oldguard, prot) != 0) goto mprot_error; - if (mprotect (guard + guardsize, + if (__mprotect (guard + guardsize, oldguard + pd->guardsize - guard - guardsize, prot) != 0) goto mprot_error; #elif _STACK_GROWS_DOWN - if (mprotect ((char *) mem + guardsize, pd->guardsize - guardsize, + if (__mprotect ((char *) mem + guardsize, pd->guardsize - guardsize, prot) != 0) goto mprot_error; #elif _STACK_GROWS_UP - if (mprotect ((char *) pd - pd->guardsize, + if (__mprotect ((char *) pd - pd->guardsize, pd->guardsize - guardsize, prot) != 0) goto mprot_error; #endif diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 7fc1e50f78..6e7d6ff09e 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -428,6 +428,8 @@ extern int __pthread_mutex_init (pthread_mutex_t *__mutex, extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex); extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); +extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, + const struct timespec *__abstime); extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex) attribute_hidden internal_function; extern void __pthread_mutex_cond_lock_adjust (pthread_mutex_t *__mutex) @@ -491,6 +493,7 @@ extern int __pthread_cond_timedwait (pthread_cond_t *cond, extern int __pthread_condattr_destroy (pthread_condattr_t *attr); extern int __pthread_condattr_init (pthread_condattr_t *attr); extern int __pthread_key_create (pthread_key_t *key, void (*destr) (void *)); +extern int __pthread_key_delete (pthread_key_t key); extern void *__pthread_getspecific (pthread_key_t key); extern int __pthread_setspecific (pthread_key_t key, const void *value); extern int __pthread_once (pthread_once_t *once_control, @@ -499,8 +502,11 @@ extern int __pthread_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void)); extern pthread_t __pthread_self (void); extern int __pthread_equal (pthread_t thread1, pthread_t thread2); +extern int __pthread_detach (pthread_t th); +extern int __pthread_cancel (pthread_t th); extern int __pthread_kill (pthread_t threadid, int signo); extern void __pthread_exit (void *value) __attribute__ ((__noreturn__)); +extern int __pthread_join (pthread_t threadid, void **thread_return); extern int __pthread_setcanceltype (int type, int *oldtype); extern int __pthread_enable_asynccancel (void) attribute_hidden; extern void __pthread_disable_asynccancel (int oldtype) @@ -511,6 +517,7 @@ extern void __pthread_testcancel (void); hidden_proto (__pthread_mutex_init) hidden_proto (__pthread_mutex_destroy) hidden_proto (__pthread_mutex_lock) +hidden_proto (__pthread_mutex_trylock) hidden_proto (__pthread_mutex_unlock) hidden_proto (__pthread_rwlock_rdlock) hidden_proto (__pthread_rwlock_wrlock) @@ -521,6 +528,8 @@ hidden_proto (__pthread_setspecific) hidden_proto (__pthread_once) hidden_proto (__pthread_setcancelstate) hidden_proto (__pthread_testcancel) +hidden_proto (__pthread_mutexattr_init) +hidden_proto (__pthread_mutexattr_settype) #endif extern int __pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond); diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c index 231a58df18..742dfe61d9 100644 --- a/nptl/pthread_cancel.c +++ b/nptl/pthread_cancel.c @@ -25,7 +25,7 @@ #include <unistd.h> int -pthread_cancel (pthread_t th) +__pthread_cancel (pthread_t th) { volatile struct pthread *pd = (volatile struct pthread *) th; @@ -66,7 +66,7 @@ pthread_cancel (pthread_t th) #ifdef SIGCANCEL /* The cancellation handler will take care of marking the thread as canceled. */ - pid_t pid = getpid (); + pid_t pid = __getpid (); INTERNAL_SYSCALL_DECL (err); int val = INTERNAL_SYSCALL_CALL (tgkill, err, pid, pd->tid, @@ -99,5 +99,6 @@ pthread_cancel (pthread_t th) return result; } +weak_alias (__pthread_cancel, pthread_cancel) -PTHREAD_STATIC_FN_REQUIRE (pthread_create) +PTHREAD_STATIC_FN_REQUIRE (__pthread_create) diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index c7d1b8f413..7a970ffc5b 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -920,14 +920,14 @@ compat_symbol (libpthread, __pthread_create_2_0, pthread_create, /* If pthread_create is present, libgcc_eh.a and libsupc++.a expects some other POSIX thread functions to be present as well. */ -PTHREAD_STATIC_FN_REQUIRE (pthread_mutex_lock) -PTHREAD_STATIC_FN_REQUIRE (pthread_mutex_trylock) -PTHREAD_STATIC_FN_REQUIRE (pthread_mutex_unlock) +PTHREAD_STATIC_FN_REQUIRE (__pthread_mutex_lock) +PTHREAD_STATIC_FN_REQUIRE (__pthread_mutex_trylock) +PTHREAD_STATIC_FN_REQUIRE (__pthread_mutex_unlock) -PTHREAD_STATIC_FN_REQUIRE (pthread_once) -PTHREAD_STATIC_FN_REQUIRE (pthread_cancel) +PTHREAD_STATIC_FN_REQUIRE (__pthread_once) +PTHREAD_STATIC_FN_REQUIRE (__pthread_cancel) -PTHREAD_STATIC_FN_REQUIRE (pthread_key_create) -PTHREAD_STATIC_FN_REQUIRE (pthread_key_delete) -PTHREAD_STATIC_FN_REQUIRE (pthread_setspecific) -PTHREAD_STATIC_FN_REQUIRE (pthread_getspecific) +PTHREAD_STATIC_FN_REQUIRE (__pthread_key_create) +PTHREAD_STATIC_FN_REQUIRE (__pthread_key_delete) +PTHREAD_STATIC_FN_REQUIRE (__pthread_setspecific) +PTHREAD_STATIC_FN_REQUIRE (__pthread_getspecific) diff --git a/nptl/pthread_detach.c b/nptl/pthread_detach.c index 8a2e943523..5c4c8f7065 100644 --- a/nptl/pthread_detach.c +++ b/nptl/pthread_detach.c @@ -22,7 +22,7 @@ int -pthread_detach (pthread_t th) +__pthread_detach (pthread_t th) { struct pthread *pd = (struct pthread *) th; @@ -53,3 +53,4 @@ pthread_detach (pthread_t th) return result; } +weak_alias (__pthread_detach, pthread_detach) diff --git a/nptl/pthread_equal.c b/nptl/pthread_equal.c index e304add047..b5244eef9f 100644 --- a/nptl/pthread_equal.c +++ b/nptl/pthread_equal.c @@ -24,4 +24,4 @@ __pthread_equal (pthread_t thread1, pthread_t thread2) { return thread1 == thread2; } -strong_alias (__pthread_equal, pthread_equal) +weak_alias (__pthread_equal, pthread_equal) diff --git a/nptl/pthread_exit.c b/nptl/pthread_exit.c index dffab0961a..72097694b3 100644 --- a/nptl/pthread_exit.c +++ b/nptl/pthread_exit.c @@ -27,8 +27,8 @@ __pthread_exit (void *value) __do_cancel (); } -strong_alias (__pthread_exit, pthread_exit) +weak_alias (__pthread_exit, pthread_exit) /* After a thread terminates, __libc_start_main decrements __nptl_nthreads defined in pthread_create.c. */ -PTHREAD_STATIC_FN_REQUIRE (pthread_create) +PTHREAD_STATIC_FN_REQUIRE (__pthread_create) diff --git a/nptl/pthread_getspecific.c b/nptl/pthread_getspecific.c index ddedcf2a76..114d6da29b 100644 --- a/nptl/pthread_getspecific.c +++ b/nptl/pthread_getspecific.c @@ -63,5 +63,5 @@ __pthread_getspecific (pthread_key_t key) return result; } -strong_alias (__pthread_getspecific, pthread_getspecific) +weak_alias (__pthread_getspecific, pthread_getspecific) hidden_def (__pthread_getspecific) diff --git a/nptl/pthread_join.c b/nptl/pthread_join.c index 0192f69a55..afc8c379ca 100644 --- a/nptl/pthread_join.c +++ b/nptl/pthread_join.c @@ -37,7 +37,7 @@ cleanup (void *arg) int -pthread_join (pthread_t threadid, void **thread_return) +__pthread_join (pthread_t threadid, void **thread_return) { struct pthread *pd = (struct pthread *) threadid; @@ -115,3 +115,4 @@ pthread_join (pthread_t threadid, void **thread_return) return result; } +weak_alias (__pthread_join, pthread_join) diff --git a/nptl/pthread_key_create.c b/nptl/pthread_key_create.c index 4f51c76767..70c0e12283 100644 --- a/nptl/pthread_key_create.c +++ b/nptl/pthread_key_create.c @@ -47,5 +47,5 @@ __pthread_key_create (pthread_key_t *key, void (*destr) (void *)) return EAGAIN; } -strong_alias (__pthread_key_create, pthread_key_create) +weak_alias (__pthread_key_create, pthread_key_create) hidden_def (__pthread_key_create) diff --git a/nptl/pthread_key_delete.c b/nptl/pthread_key_delete.c index 605f93b871..426163dac6 100644 --- a/nptl/pthread_key_delete.c +++ b/nptl/pthread_key_delete.c @@ -22,7 +22,7 @@ int -pthread_key_delete (pthread_key_t key) +__pthread_key_delete (pthread_key_t key) { int result = EINVAL; @@ -39,3 +39,4 @@ pthread_key_delete (pthread_key_t key) return result; } +weak_alias (__pthread_key_delete, pthread_key_delete) diff --git a/nptl/pthread_mutex_destroy.c b/nptl/pthread_mutex_destroy.c index a3008321bd..ed3b63f7eb 100644 --- a/nptl/pthread_mutex_destroy.c +++ b/nptl/pthread_mutex_destroy.c @@ -36,5 +36,5 @@ __pthread_mutex_destroy (pthread_mutex_t *mutex) return 0; } -strong_alias (__pthread_mutex_destroy, pthread_mutex_destroy) +weak_alias (__pthread_mutex_destroy, pthread_mutex_destroy) hidden_def (__pthread_mutex_destroy) diff --git a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c index 138e144155..6f2fc808ff 100644 --- a/nptl/pthread_mutex_init.c +++ b/nptl/pthread_mutex_init.c @@ -144,5 +144,5 @@ __pthread_mutex_init (pthread_mutex_t *mutex, return 0; } -strong_alias (__pthread_mutex_init, pthread_mutex_init) +weak_alias (__pthread_mutex_init, pthread_mutex_init) hidden_def (__pthread_mutex_init) diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index dc9ca4c476..b76475bc63 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -597,7 +597,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) return 0; } #ifndef __pthread_mutex_lock -strong_alias (__pthread_mutex_lock, pthread_mutex_lock) +weak_alias (__pthread_mutex_lock, pthread_mutex_lock) hidden_def (__pthread_mutex_lock) #endif diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index a4beb7b0dc..be5338178f 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -41,8 +41,8 @@ #endif int -pthread_mutex_timedlock (pthread_mutex_t *mutex, - const struct timespec *abstime) +__pthread_mutex_timedlock (pthread_mutex_t *mutex, + const struct timespec *abstime) { int oldval; pid_t id = THREAD_GETMEM (THREAD_SELF, tid); @@ -634,3 +634,4 @@ pthread_mutex_timedlock (pthread_mutex_t *mutex, out: return result; } +weak_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock) diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c index e514997be8..ec7da61c73 100644 --- a/nptl/pthread_mutex_trylock.c +++ b/nptl/pthread_mutex_trylock.c @@ -403,6 +403,7 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) #ifndef __pthread_mutex_trylock #ifndef pthread_mutex_trylock -strong_alias (__pthread_mutex_trylock, pthread_mutex_trylock) +weak_alias (__pthread_mutex_trylock, pthread_mutex_trylock) +hidden_def (__pthread_mutex_trylock) #endif #endif diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c index f701d4e274..e1a8a5c617 100644 --- a/nptl/pthread_mutex_unlock.c +++ b/nptl/pthread_mutex_unlock.c @@ -346,5 +346,5 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex) { return __pthread_mutex_unlock_usercnt (mutex, 1); } -strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock) +weak_alias (__pthread_mutex_unlock, pthread_mutex_unlock) hidden_def (__pthread_mutex_unlock) diff --git a/nptl/pthread_mutexattr_init.c b/nptl/pthread_mutexattr_init.c index 210d490c44..dcad522ae8 100644 --- a/nptl/pthread_mutexattr_init.c +++ b/nptl/pthread_mutexattr_init.c @@ -33,4 +33,5 @@ __pthread_mutexattr_init (pthread_mutexattr_t *attr) return 0; } -strong_alias (__pthread_mutexattr_init, pthread_mutexattr_init) +weak_alias (__pthread_mutexattr_init, pthread_mutexattr_init) +hidden_def (__pthread_mutexattr_init) diff --git a/nptl/pthread_mutexattr_settype.c b/nptl/pthread_mutexattr_settype.c index 8c4d11f998..988793bbbf 100644 --- a/nptl/pthread_mutexattr_settype.c +++ b/nptl/pthread_mutexattr_settype.c @@ -40,4 +40,5 @@ __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind) return 0; } weak_alias (__pthread_mutexattr_settype, pthread_mutexattr_setkind_np) -strong_alias (__pthread_mutexattr_settype, pthread_mutexattr_settype) +weak_alias (__pthread_mutexattr_settype, pthread_mutexattr_settype) +hidden_def (__pthread_mutexattr_settype) diff --git a/nptl/pthread_self.c b/nptl/pthread_self.c index 4c978e1cfa..8e21775e31 100644 --- a/nptl/pthread_self.c +++ b/nptl/pthread_self.c @@ -25,4 +25,4 @@ __pthread_self (void) { return (pthread_t) THREAD_SELF; } -strong_alias (__pthread_self, pthread_self) +weak_alias (__pthread_self, pthread_self) diff --git a/nptl/pthread_setspecific.c b/nptl/pthread_setspecific.c index c5416a5ae0..214af3b661 100644 --- a/nptl/pthread_setspecific.c +++ b/nptl/pthread_setspecific.c @@ -89,5 +89,5 @@ __pthread_setspecific (pthread_key_t key, const void *value) return 0; } -strong_alias (__pthread_setspecific, pthread_setspecific) +weak_alias (__pthread_setspecific, pthread_setspecific) hidden_def (__pthread_setspecific) diff --git a/nptl/tpp.c b/nptl/tpp.c index 57eb026088..7eb2b96b99 100644 --- a/nptl/tpp.c +++ b/nptl/tpp.c @@ -43,9 +43,9 @@ void __init_sched_fifo_prio (void) { atomic_store_relaxed (&__sched_fifo_max_prio, - sched_get_priority_max (SCHED_FIFO)); + __sched_get_priority_max (SCHED_FIFO)); atomic_store_relaxed (&__sched_fifo_min_prio, - sched_get_priority_min (SCHED_FIFO)); + __sched_get_priority_min (SCHED_FIFO)); } int |