From 83b09837ed5c106840d0f069a81eed41a646bff3 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 31 Aug 2017 17:50:26 +0200 Subject: nptl: Remove internal_function attribute --- ChangeLog | 20 ++++++++++++++++++++ nptl/allocatestack.c | 5 ----- nptl/cancellation.c | 2 +- nptl/libc_pthread_init.c | 1 - nptl/pthreadP.h | 29 +++++++++++------------------ nptl/pthread_create.c | 2 -- nptl/pthread_mutex_cond_lock.c | 2 +- nptl/pthread_mutex_lock.c | 1 - nptl/pthread_mutex_unlock.c | 4 +--- 9 files changed, 34 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb9c6b2f0f..c83315ae3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2017-08-31 Florian Weimer + + * nptl/allocatestack.c (change_stack_perm, __deallocate_stack) + (setxid_mark_thread, setxid_unmark_thread, setxid_signal_thread): + Remove internal_function. + * nptl/cancellation.c (__pthread_disable_asynccancel): Likewise. + * nptl/libc_pthread_init.c (__libc_pthread_init): Likewise. + * nptl/pthreadP.h (__find_in_stack_list, __free_tcb) + (__deallocate_stack, __libc_pthread_init) + (__pthread_mutex_cond_lock, __pthread_mutex_cond_lock_adjust) + (__pthread_mutex_unlock_usercnt, __pthread_disable_asynccancel) + (__libc_disable_asynccancel, __librt_disable_asynccancel): + Likewise. + * nptl/pthread_create.c (__find_in_stack_list, __free_tcb): Likewise. + * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Likewise. + * nptl/pthread_mutex_lock.c (__pthread_mutex_cond_lock_adjust): + Likewise. + * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_full) + (__pthread_mutex_unlock_usercnt): Likewise. + 2017-08-31 Florian Weimer * io/fts.c (fts_alloc, fts_build, fts_lfree, fts_load) diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 8766debde5..196371a88f 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -307,7 +307,6 @@ queue_stack (struct pthread *stack) static int -internal_function change_stack_perm (struct pthread *pd #ifdef NEED_SEPARATE_REGISTER_STACK , size_t pagemask @@ -787,7 +786,6 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, void -internal_function __deallocate_stack (struct pthread *pd) { lll_lock (stack_cache_lock, LLL_PRIVATE); @@ -1016,7 +1014,6 @@ __find_thread_by_id (pid_t tid) #ifdef SIGSETXID static void -internal_function setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) { int ch; @@ -1054,7 +1051,6 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) static void -internal_function setxid_unmark_thread (struct xid_command *cmdp, struct pthread *t) { int ch; @@ -1075,7 +1071,6 @@ setxid_unmark_thread (struct xid_command *cmdp, struct pthread *t) static int -internal_function setxid_signal_thread (struct xid_command *cmdp, struct pthread *t) { if ((t->cancelhandling & SETXID_BITMASK) == 0) diff --git a/nptl/cancellation.c b/nptl/cancellation.c index e3f0b619d6..f3a38059d5 100644 --- a/nptl/cancellation.c +++ b/nptl/cancellation.c @@ -61,7 +61,7 @@ __pthread_enable_asynccancel (void) void -internal_function attribute_hidden +attribute_hidden __pthread_disable_asynccancel (int oldtype) { /* If asynchronous cancellation was enabled before we do not have diff --git a/nptl/libc_pthread_init.c b/nptl/libc_pthread_init.c index 0db7a10893..875b27e74c 100644 --- a/nptl/libc_pthread_init.c +++ b/nptl/libc_pthread_init.c @@ -38,7 +38,6 @@ extern int __libc_multiple_threads attribute_hidden; int * #endif -internal_function __libc_pthread_init (unsigned long int *ptr, void (*reclaim) (void), const struct pthread_functions *functions) { diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 5f0c18299d..dbf46b0973 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -341,15 +341,14 @@ __do_cancel (void) /* Thread list handling. */ extern struct pthread *__find_in_stack_list (struct pthread *pd) - attribute_hidden internal_function; + attribute_hidden; /* Deallocate a thread's stack after optionally making sure the thread descriptor is still valid. */ -extern void __free_tcb (struct pthread *pd) attribute_hidden internal_function; +extern void __free_tcb (struct pthread *pd) attribute_hidden; /* Free allocated stack. */ -extern void __deallocate_stack (struct pthread *pd) - attribute_hidden internal_function; +extern void __deallocate_stack (struct pthread *pd) attribute_hidden; /* Mark all the stacks except for the current one as available. This function also re-initializes the lock for the stack cache. */ @@ -386,13 +385,11 @@ hidden_proto (__nptl_death_event) #ifdef TLS_MULTIPLE_THREADS_IN_TCB extern void __libc_pthread_init (unsigned long int *ptr, void (*reclaim) (void), - const struct pthread_functions *functions) - internal_function; + const struct pthread_functions *functions); #else extern int *__libc_pthread_init (unsigned long int *ptr, void (*reclaim) (void), - const struct pthread_functions *functions) - internal_function; + const struct pthread_functions *functions); /* Variable set to a nonzero value either if more than one thread runs or ran, or if a single-threaded process is trying to cancel itself. See @@ -430,13 +427,12 @@ 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; + attribute_hidden; extern void __pthread_mutex_cond_lock_adjust (pthread_mutex_t *__mutex) - attribute_hidden internal_function; + attribute_hidden; extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); extern int __pthread_mutex_unlock_usercnt (pthread_mutex_t *__mutex, - int __decr) - attribute_hidden internal_function; + int __decr) attribute_hidden; extern int __pthread_mutexattr_init (pthread_mutexattr_t *attr); extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *attr); extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind); @@ -508,8 +504,7 @@ 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) - internal_function attribute_hidden; +extern void __pthread_disable_asynccancel (int oldtype) attribute_hidden; extern void __pthread_testcancel (void); #if IS_IN (libpthread) @@ -547,14 +542,12 @@ extern int __pthread_getaffinity_np (pthread_t th, size_t cpusetsize, /* The two functions are in libc.so and not exported. */ extern int __libc_enable_asynccancel (void) attribute_hidden; -extern void __libc_disable_asynccancel (int oldtype) - internal_function attribute_hidden; +extern void __libc_disable_asynccancel (int oldtype) attribute_hidden; /* The two functions are in librt.so and not exported. */ extern int __librt_enable_asynccancel (void) attribute_hidden; -extern void __librt_disable_asynccancel (int oldtype) - internal_function attribute_hidden; +extern void __librt_disable_asynccancel (int oldtype) attribute_hidden; #if IS_IN (libpthread) /* Special versions which use non-exported functions. */ diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 83b88bfb38..992331e280 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -205,7 +205,6 @@ static int create_thread (struct pthread *pd, const struct pthread_attr *attr, struct pthread * -internal_function __find_in_stack_list (struct pthread *pd) { list_t *entry; @@ -341,7 +340,6 @@ __nptl_deallocate_tsd (void) /* Deallocate a thread's stack after optionally making sure the thread descriptor is still valid. */ void -internal_function __free_tcb (struct pthread *pd) { /* The thread is exiting now. */ diff --git a/nptl/pthread_mutex_cond_lock.c b/nptl/pthread_mutex_cond_lock.c index bd7149ef1d..2f0771302f 100644 --- a/nptl/pthread_mutex_cond_lock.c +++ b/nptl/pthread_mutex_cond_lock.c @@ -14,7 +14,7 @@ /* We need to assume that there are other threads blocked on the futex. See __pthread_mutex_lock_full for further details. */ #define LLL_ROBUST_MUTEX_LOCK_MODIFIER FUTEX_WAITERS -#define __pthread_mutex_lock internal_function __pthread_mutex_cond_lock +#define __pthread_mutex_lock __pthread_mutex_cond_lock #define __pthread_mutex_lock_full __pthread_mutex_cond_lock_full #define NO_INCR diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index b1586079ad..7f8254ba33 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -607,7 +607,6 @@ hidden_def (__pthread_mutex_lock) #ifdef NO_INCR void -internal_function __pthread_mutex_cond_lock_adjust (pthread_mutex_t *mutex) { assert ((mutex->__data.__kind & PTHREAD_MUTEX_PRIO_INHERIT_NP) != 0); diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c index e1a8a5c617..c7e67959b7 100644 --- a/nptl/pthread_mutex_unlock.c +++ b/nptl/pthread_mutex_unlock.c @@ -28,12 +28,11 @@ #endif static int -internal_function __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr) __attribute_noinline__; int -internal_function attribute_hidden +attribute_hidden __pthread_mutex_unlock_usercnt (pthread_mutex_t *mutex, int decr) { int type = PTHREAD_MUTEX_TYPE_ELISION (mutex); @@ -92,7 +91,6 @@ __pthread_mutex_unlock_usercnt (pthread_mutex_t *mutex, int decr) static int -internal_function __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr) { int newowner = 0; -- cgit v1.2.3