path: root/src/thread/pthread_cancel.c
diff options
authorRich Felker <>2015-04-14 11:18:59 -0400
committerRich Felker <>2015-04-14 11:18:59 -0400
commitcbc02ba23cec16d7a821648ea8424546bc7f02dc (patch)
treec3650ae9dc0fe3506365371cb0fd0358df6597cf /src/thread/pthread_cancel.c
parentbc081f628b51337b525ca2d53aeff1b971f092f5 (diff)
consistently use hidden visibility for cancellable syscall internals
in a few places, non-hidden symbols were referenced from asm in ways that assumed ld-time binding. while these is no semantic reason these symbols need to be hidden, fixing the references without making them hidden was going to be ugly, and hidden reduces some bloat anyway. in the asm files, .global/.hidden directives have been moved to the top to unclutter the actual code.
Diffstat (limited to 'src/thread/pthread_cancel.c')
1 files changed, 11 insertions, 3 deletions
diff --git a/src/thread/pthread_cancel.c b/src/thread/pthread_cancel.c
index 7c5dda31..fde09080 100644
--- a/src/thread/pthread_cancel.c
+++ b/src/thread/pthread_cancel.c
@@ -3,7 +3,13 @@
#include "syscall.h"
#include "libc.h"
-long __cancel()
+#ifdef SHARED
+#define hidden __attribute__((__visibility__("hidden")))
+#define hidden
+hidden long __cancel()
pthread_t self = __pthread_self();
if (self->canceldisable == PTHREAD_CANCEL_ENABLE || self->cancelasync)
@@ -16,12 +22,14 @@ long __cancel()
* definition of __cp_cancel to undo those adjustments and call __cancel.
* Otherwise, __cancel provides a definition for __cp_cancel. */
-weak_alias(__cancel, __cp_cancel);
+hidden 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)
@@ -52,7 +60,7 @@ 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];
- extern const char __cp_begin[1], __cp_end[1];
+ hidden extern const char __cp_begin[1], __cp_end[1];
if (!self->cancel || self->canceldisable == PTHREAD_CANCEL_DISABLE) return;