From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/2770 Path: news.gmane.org!not-for-mail From: Jens Gustedt Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] move the definition of __pthread_tsd_main in the only compilation unit that references it Date: Mon, 11 Feb 2013 10:19:44 +0100 Message-ID: <1360574285.9132.14.camel@eris.loria.fr> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1360574397 4186 80.91.229.3 (11 Feb 2013 09:19:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Feb 2013 09:19:57 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-2771-gllmg-musl=m.gmane.org@lists.openwall.com Mon Feb 11 10:20:19 2013 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1U4pYg-0006bP-Aa for gllmg-musl@plane.gmane.org; Mon, 11 Feb 2013 10:20:18 +0100 Original-Received: (qmail 3556 invoked by uid 550); 11 Feb 2013 09:19:56 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 3548 invoked from network); 11 Feb 2013 09:19:55 -0000 X-IronPort-AV: E=Sophos;i="4.84,641,1355094000"; d="scan'208";a="2263058" Resent-From: Jens Gustedt Resent-To: musl@lists.openwall.com Resent-Cc: musl X-Mailer: Evolution 3.2.3-0ubuntu6 Xref: news.gmane.org gmane.linux.lib.musl.general:2770 Archived-At: This also avoids a const cast that doesn't seem to be very useful. 0 3 src/thread/pthread_key_create.c 4 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..efb3f0c 100644 --- a/src/thread/pthread_self.c +++ b/src/thread/pthread_self.c @@ -2,9 +2,9 @@ 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] = { 0 }; +/* unused? */ +const size_t __pthread_tsd_size = sizeof(__pthread_tsd_main); static int init_main_thread() { @@ -12,7 +12,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