about summary refs log tree commit diff
path: root/src/thread/pthread_self.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-02-27 18:51:02 -0500
committerRich Felker <dalias@aerifal.cx>2012-02-27 18:51:02 -0500
commitdac084a4c5f52bb3b121675320c47d3c3614174e (patch)
tree4bedab31901416ccf1093b083dba7df5a699096d /src/thread/pthread_self.c
parent834255a3ffb5be208024e66b1f794d9f4201413c (diff)
downloadmusl-dac084a4c5f52bb3b121675320c47d3c3614174e.tar.gz
musl-dac084a4c5f52bb3b121675320c47d3c3614174e.tar.xz
musl-dac084a4c5f52bb3b121675320c47d3c3614174e.zip
work around "signal loses thread pointer" issue with "approach 2"
this was discussed on the mailing list and no consensus on the
preferred solution was reached, so in anticipation of a release, i'm
just committing a minimally-invasive solution that avoids the problem
by ensuring that multi-threaded-capable programs will always have
initialized the thread pointer before any signal handler can run.

in the long term we may switch to initializing the thread pointer at
program start time whenever the program has the potential to access
any per-thread data.
Diffstat (limited to 'src/thread/pthread_self.c')
-rw-r--r--src/thread/pthread_self.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index cc2ddfb7..51f12bb3 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -19,7 +19,7 @@ static int init_main_thread()
 	return 0;
 }
 
-pthread_t pthread_self()
+pthread_t __pthread_self_def()
 {
 	static int init, failed;
 	if (!init) {
@@ -31,4 +31,5 @@ pthread_t pthread_self()
 	return __pthread_self();
 }
 
-weak_alias(pthread_self, __pthread_self_init);
+weak_alias(__pthread_self_def, pthread_self);
+weak_alias(__pthread_self_def, __pthread_self_init);