From: Jens Gustedt <Jens.Gustedt@inria.fr>
To: musl@lists.openwall.com
Subject: [PATCH v3] move the definition of __pthread_tsd_main to the only compilation unit that references it
Date: Mon, 11 Feb 2013 11:44:21 +0100 [thread overview]
Message-ID: <1360579429.9132.37.camel@eris.loria.fr> (raw)
- Avoids a const cast that doesn't seem to be very useful.
- Remove unused __pthread_tsd_size
0 3 src/thread/pthread_key_create.c
2 4 src/thread/pthread_self.c
diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index e51cb02..084cbaa 100644
--- a/src/thread/pthread_key_create.c
+++ b/src/thread/pthread_key_create.c
@@ -1,8 +1,5 @@
#include "pthread_impl.h"
-const size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
-void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 };
-
static void (*keys[PTHREAD_KEYS_MAX])(void *);
static void nodtor(void *dummy)
diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 23dbaa5..af4998d 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,9 +2,7 @@
static struct pthread *main_thread = &(struct pthread){0};
-/* pthread_key_create.c overrides this */
-static const void *dummy[1] = { 0 };
-weak_alias(dummy, __pthread_tsd_main);
+static void *__pthread_tsd_main[PTHREAD_KEYS_MAX];
static int init_main_thread()
{
@@ -12,7 +10,7 @@ static int init_main_thread()
SIGPT_SET, 0, __SYSCALL_SSLEN);
if (__set_thread_area(TP_ADJ(main_thread)) < 0) return -1;
main_thread->canceldisable = libc.canceldisable;
- main_thread->tsd = (void **)__pthread_tsd_main;
+ main_thread->tsd = __pthread_tsd_main;
main_thread->errno_ptr = __errno_location();
main_thread->self = main_thread;
main_thread->tid = main_thread->pid =
--
1.7.9.5
next reply other threads:[~2013-02-11 10:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 10:44 Jens Gustedt [this message]
2013-02-11 11:14 ` Szabolcs Nagy
2013-02-11 12:24 ` Jens Gustedt
2013-02-11 12:51 ` Szabolcs Nagy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360579429.9132.37.camel@eris.loria.fr \
--to=jens.gustedt@inria.fr \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).