fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-27 21:52:02 +00:00
Code Issues Projects Releases Wiki Activity

consistently use hidden visibility for cancellable syscall internals

Browse Source 
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.
This commit is contained in:
Rich Felker
2015-04-14 11:18:59 -04:00
parent bc081f628b
commit cbc02ba23c
12 changed files with 103 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/thread/pthread_cancel.c
View File

@ -3,7 +3,13 @@
#include "syscall.h"
#include "libc.h"
long __cancel()
#ifdef SHARED
#define hidden __attribute__((__visibility__("hidden")))
#else
#define hidden
#endif
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);
hidden
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);
hidden
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];
a_barrier();
if (!self->cancel || self->canceldisable == PTHREAD_CANCEL_DISABLE) return;