path: root/src
diff options
authorRich Felker <>2015-04-14 13:49:05 -0400
committerRich Felker <>2015-04-14 13:49:05 -0400
commit9c738dc183f44de40d263e4ff8dc540915a41aed (patch)
tree68b0b51718276e949bbeb729e6bc26e28bcdbfa1 /src
parent7405cd1e2bafc046b4311005b94092d74a7a9c66 (diff)
cleanup use of visibility attributes in pthread_cancel.c
applying the attribute to a weak_alias macro was a hack. instead use a separate declaration to apply the visibility, and consolidate declarations together to avoid having visibility mess all over the file.
Diffstat (limited to 'src')
1 files changed, 9 insertions, 8 deletions
diff --git a/src/thread/pthread_cancel.c b/src/thread/pthread_cancel.c
index fde09080..0151a1ae 100644
--- a/src/thread/pthread_cancel.c
+++ b/src/thread/pthread_cancel.c
@@ -4,12 +4,11 @@
#include "libc.h"
#ifdef SHARED
-#define hidden __attribute__((__visibility__("hidden")))
-#define hidden
+long __cancel(), __cp_cancel(), __syscall_cp_asm(), __syscall_cp_c();
-hidden long __cancel()
+long __cancel()
pthread_t self = __pthread_self();
if (self->canceldisable == PTHREAD_CANCEL_ENABLE || self->cancelasync)
@@ -22,14 +21,12 @@ hidden long __cancel()
* definition of __cp_cancel to undo those adjustments and call __cancel.
* Otherwise, __cancel provides a definition for __cp_cancel. */
-hidden weak_alias(__cancel, __cp_cancel);
+weak_alias(__cancel, __cp_cancel);
long __syscall_cp_asm(volatile void *, syscall_arg_t,
syscall_arg_t, syscall_arg_t, syscall_arg_t,
syscall_arg_t, syscall_arg_t, syscall_arg_t);
long __syscall_cp_c(syscall_arg_t nr,
syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
@@ -55,12 +52,16 @@ static void _sigaddset(sigset_t *set, int sig)
set->__bits[s/8/sizeof *set->__bits] |= 1UL<<(s&8*sizeof *set->__bits-1);
+#ifdef SHARED
+extern const char __cp_begin[1], __cp_end[1];
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
pthread_t self = __pthread_self();
ucontext_t *uc = ctx;
const char *ip = ((char **)&uc->uc_mcontext)[CANCEL_REG_IP];
- hidden extern const char __cp_begin[1], __cp_end[1];
if (!self->cancel || self->canceldisable == PTHREAD_CANCEL_DISABLE) return;