From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-7133-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 4872 invoked by alias); 29 Dec 2003 16:57:31 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 4856 invoked from network); 29 Dec 2003 16:57:30 -0000
Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.19.66)
  by sources.redhat.com with SMTP; 29 Dec 2003 16:57:30 -0000
Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id hBTEow2c002169;
	Mon, 29 Dec 2003 15:50:58 +0100
Received: (from jakub@localhost)
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id hBTEowtI002167;
	Mon, 29 Dec 2003 15:50:58 +0100
Date: Mon, 29 Dec 2003 16:57:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Make IA-64 --with-tls --without-__thread LinuxThreads ld.so work again with NPTL libc/libpthread
Message-ID: <20031229145058.GQ12344@sunsite.ms.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4i
X-SW-Source: 2003-12/txt/msg00094.txt.bz2

Hi!

2003-12-29  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/ia64/tls.h: Include dl-sysdep.h.
	(INIT_SYSINFO): Define.
	(TLS_INIT_TP): Use it.

--- libc/linuxthreads/sysdeps/ia64/tls.h.jj	2003-08-06 20:36:13.000000000 +0200
+++ libc/linuxthreads/sysdeps/ia64/tls.h	2003-12-29 17:36:09.000000000 +0100
@@ -22,6 +22,7 @@
 
 #ifndef __ASSEMBLER__
 
+# include <dl-sysdep.h>
 # include <pt-machine.h>
 # include <stddef.h>
 
@@ -80,11 +81,18 @@ typedef struct
 #  define GET_DTV(tcbp) \
   (((tcbhead_t *) (tcbp))->dtv)
 
+#if defined NEED_DL_SYSINFO
+# define INIT_SYSINFO \
+  (((tcbhead_t *)__thread_self)->private = GL(dl_sysinfo))
+#else
+# define INIT_SYSINFO 0
+#endif
+
 /* Code to initially initialize the thread pointer.  This might need
    special attention since 'errno' is not yet available and if the
    operation can cause a failure 'errno' must not be touched.  */
 #  define TLS_INIT_TP(tcbp, secondcall) \
-  (__thread_self = (__typeof (__thread_self)) (tcbp), NULL)
+  (__thread_self = (__typeof (__thread_self)) (tcbp), INIT_SYSINFO, NULL)
 
 /* Return the address of the dtv for the current thread.  */
 #  define THREAD_DTV() \

	Jakub