diff --git a/ChangeLog b/ChangeLog
index bef7079134..49945b1d2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/dl-load.c (_dl_map_object_from_fd): Use
+	GL(dl_tls_dtv_slotinfo_list) != NULL to check whether TLS has
+	been already initialized.
+
 2003-01-15  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* sysdeps/unix/sysv/linux/ptsname.c: Fix typo in comment.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 9d9ba94539..9856294c67 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -953,9 +953,9 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
 	  /* If not loading the initial set of shared libraries,
 	     check whether we should permit loading a TLS segment.  */
 	  if (__builtin_expect (l->l_type == lt_library, 1)
-	      /* If GL(dl_tls_max_dtv_idx) == 0, then rtld.c did not
-		 set up TLS data structures, so don't use them now.  */
-	      || __builtin_expect (GL(dl_tls_max_dtv_idx), 1) != 0)
+	      /* If GL(dl_tls_dtv_slotinfo_list) == NULL, then rtld.c did
+		 not set up TLS data structures, so don't use them now.  */
+	      || __builtin_expect (GL(dl_tls_dtv_slotinfo_list) != NULL, 1))
 	    {
 	      /* Assign the next available module ID.  */
 	      l->l_tls_modid = _dl_next_tls_modid ();
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 6a844b928c..990ebb3bae 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* pthread.c (_pthread_initialize_minimal): Use
+	GL(dl_tls_dtv_slotinfo_list) != NULL to check whether TLS has
+	been already initialized.
+
 2003-01-16  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/i386/tls.h (INIT_SYSINFO): Initialize head->sysinfo even
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index f72e20ee09..2888a6a2f7 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -305,7 +305,7 @@ __pthread_initialize_minimal(void)
      taken care of initializing the TLS data structures.  */
   __libc_setup_tls (TLS_TCB_SIZE, TLS_TCB_ALIGN);
 # elif !USE___THREAD
-  if (__builtin_expect (GL(dl_tls_max_dtv_idx) == 0, 0))
+  if (__builtin_expect (GL(dl_tls_dtv_slotinfo_list) == NULL, 0))
     {
       tcbhead_t *tcbp;
 
diff --git a/linuxthreads/sysdeps/ia64/tcb-offsets.sym b/linuxthreads/sysdeps/ia64/tcb-offsets.sym
index a1d199f44e..2b677f5abb 100644
--- a/linuxthreads/sysdeps/ia64/tcb-offsets.sym
+++ b/linuxthreads/sysdeps/ia64/tcb-offsets.sym
@@ -1,4 +1,9 @@
 #include <sysdep.h>
 #include <tls.h>
 
+--
+#ifdef USE_TLS
 MULTIPLE_THREADS_OFFSET offsetof (struct _pthread_descr_struct, p_header.data.multiple_threads) - sizeof (struct _pthread_descr_struct)
+#else
+MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads)
+#endif
diff --git a/linuxthreads/sysdeps/ia64/tls.h b/linuxthreads/sysdeps/ia64/tls.h
index b2c47c00a6..238ea08399 100644
--- a/linuxthreads/sysdeps/ia64/tls.h
+++ b/linuxthreads/sysdeps/ia64/tls.h
@@ -32,13 +32,6 @@ typedef union dtv
   void *pointer;
 } dtv_t;
 
-
-typedef struct
-{
-  dtv_t *dtv;
-  void *private;
-} tcbhead_t;
-
 #else /* __ASSEMBLER__ */
 # include <tcb-offsets.h>
 #endif /* __ASSEMBLER__ */
@@ -49,6 +42,13 @@ typedef struct
 # define USE_TLS        1
 
 # ifndef __ASSEMBLER__
+
+typedef struct
+{
+  dtv_t *dtv;
+  void *private;
+} tcbhead_t;
+
 /* This is the size of the initial TCB.  */
 #  define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
 
@@ -106,14 +106,22 @@ typedef struct
 #else
 
 # ifndef __ASSEMBLER__
+
+typedef struct
+{
+  void *tcb;
+  dtv_t *dtv;
+  void *self;
+  int multiple_threads;
+} tcbhead_t;
+
 /* Get the thread descriptor definition.  */
 #  include <linuxthreads/descr.h>
 
 #  define NONTLS_INIT_TP \
   do { 									\
-    static struct _pthread_descr_struct nontls_init_tp			\
-      = { .p_header.data.multiple_threads = 0 };			\
-    __thread_self = ((__typeof (__thread_self)) &nontls_init_tp) + 1;	\
+    static const tcbhead_t nontls_init_tp = { .multiple_threads = 0 };	\
+    __thread_self = (__typeof (__thread_self)) &nontls_init_tp;		\
   } while (0)
 
 #endif
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4d1f8ccfde..f6d60a0c2f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/i386/tls.h (INIT_SYSINFO): Initialize _head->sysinfo even
+	if not SHARED.
+
 2003-01-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* sem_open.c (sem_open): Return SEM_FAILED if existing semaphore