From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/2764 Path: news.gmane.org!not-for-mail From: Jens Gustedt Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 2/3] Have different definitions of __pthread_tsd_main agree in size Date: Sun, 10 Feb 2013 23:32:47 +0100 Message-ID: <1360535367.23424.466.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 1360535580 5697 80.91.229.3 (10 Feb 2013 22:33:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 10 Feb 2013 22:33:00 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-2765-gllmg-musl=m.gmane.org@lists.openwall.com Sun Feb 10 23:33:22 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 1U4fSY-0000HH-U7 for gllmg-musl@plane.gmane.org; Sun, 10 Feb 2013 23:33:19 +0100 Original-Received: (qmail 5301 invoked by uid 550); 10 Feb 2013 22:32:59 -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 5292 invoked from network); 10 Feb 2013 22:32:59 -0000 X-IronPort-AV: E=Sophos;i="4.84,639,1355094000"; d="scan'208";a="2216078" 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:2764 Archived-At: When switching optimization to higher levels (-O3) and enable link time optimization (-flto) gcc finds two instances of the __pthread_tsd_main variable that are declared with different sizes. The real size that is needed is known in both source files. Just use equivalent definitions. 1 1 src/thread/pthread_self.c diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c index 23dbaa5..32a6e5d 100644 --- a/src/thread/pthread_self.c +++ b/src/thread/pthread_self.c @@ -3,7 +3,7 @@ static struct pthread *main_thread = &(struct pthread){0}; /* pthread_key_create.c overrides this */ -static const void *dummy[1] = { 0 }; +static const void *dummy[PTHREAD_KEYS_MAX] = { 0 }; weak_alias(dummy, __pthread_tsd_main); static int init_main_thread() -- 1.7.9.5