* sysdeps/generic/ldsodefs.h (struct rtld_global): Move all [USE_TLS]

	members to the end, so a libpthread compiled with !USE_TLS will still
	find other members properly.

	* sysdeps/i386/i486/bits/string.h (__strcpy_g): Add dummy output
	operand for DEST memory.  Fix dummy input operand to use SRC.
	Reported by Davin McCall <davmac@ozonline.com.au>.

	* sysdeps/generic/libc-tls.c (__libc_setup_tls): Account for TCB
	alignment when initializing the DTV entry.

	* elf/dl-load.c (_dl_map_object_from_fd): If we hit a TLS segment
	when TLS has not been set up, try to set it up if we can.
	* elf/tst-tls4.c: Revert last change.
	* elf/tst-tls5.c: Likewise.
	* elf/tst-tls6.c: Likewise.
	* elf/tst-tls7.c: Likewise.
	* elf/tst-tls8.c: Likewise.
	* elf/tst-tls9.c: Likewise.

	* sysdeps/generic/dl-tls.c [SHARED] (_dl_tls_setup): New function.
	* sysdeps/generic/ldsodefs.h: Declare it.
	* elf/Versions (ld: GLIBC_PRIVATE): Add it.
	* sysdeps/generic/libc-tls.c (init_slotinfo): New static inline
	function, broken out of __libc_setup_tls.
	(init_static_tls): Likewise.
	(__libc_setup_tls): Call them.
	(_dl_tls_setup): New function, uses new subroutines.

	* elf/dl-close.c (free_slotinfo): Make argument pointer to pointer.
	Clear the pointer when returning true.
	(libc_freeres_fn) [SHARED]: If GL(dl_initial_dtv) is null, free the
	first element of the slotinfo list too.

	* sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): Define only if
	[SHARED].

	* sysdeps/generic/ldsodefs.h (_dl_next_tls_modid): Declare as hidden.
	(_dl_determine_tlsoffset): Likewise.

	* elf/rtld.c (_dl_initial_error_catch_tsd): Renamed from
	startup_error_tsd, made global.
	(dl_main): Update initialization.
	* elf/dl-tsd.c: Likewise.
	* sysdeps/generic/ldsodefs.h: Declare it.

1 files changed, 19 insertions, 14 deletions

diff --git a/elf/dl-close.c b/elf/dl-close.c
index b5c2841d61..0a6265f142 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -429,28 +429,28 @@ libc_hidden_def (_dl_close)
 
 #ifdef USE_TLS
 static bool
-free_slotinfo (struct dtv_slotinfo_list *elemp)
+free_slotinfo (struct dtv_slotinfo_list **elemp)
 {
   size_t cnt;
 
-  if (elemp == NULL)
+  if (*elemp == NULL)
     /* Nothing here, all is removed (or there never was anything).  */
     return true;
 
-  if (!free_slotinfo (elemp->next))
+  if (!free_slotinfo (&(*elemp)->next))
     /* We cannot free the entry.  */
     return false;
 
-  /* The least we could do is remove next element (if there was any).  */
-  elemp->next = NULL;
+  /* That cleared our next pointer for us.  */
 
-  for (cnt = 0; cnt < elemp->len; ++cnt)
-    if (elemp->slotinfo[cnt].map != NULL)
+  for (cnt = 0; cnt < (*elemp)->len; ++cnt)
+    if ((*elemp)->slotinfo[cnt].map != NULL)
       /* Still used.  */
       return false;
 
   /* We can remove the list element.  */
-  free (elemp);
+  free (*elemp);
+  *elemp = NULL;
 
   return true;
 }
@@ -479,12 +479,17 @@ libc_freeres_fn (free_mem)
   if (USE___THREAD || GL(dl_tls_dtv_slotinfo_list) != NULL)
     {
       /* Free the memory allocated for the dtv slotinfo array.  We can do
-	 this only if all modules which used this memory are unloaded.
-	 Also, the first element of the list does not have to be
-	 deallocated.  It was allocated in the dynamic linker (i.e., with
-	 a different malloc).  */
-      if (free_slotinfo (GL(dl_tls_dtv_slotinfo_list)->next))
-	GL(dl_tls_dtv_slotinfo_list)->next = NULL;
+	 this only if all modules which used this memory are unloaded.  */
+# ifdef SHARED
+      if (GL(dl_initial_dtv) == NULL)
+	/* There was no initial TLS setup, it was set up later when
+	   it used the normal malloc.  */
+	free_slotinfo (&GL(dl_tls_dtv_slotinfo_list));
+# endif
+      /* The first element of the list does not have to be deallocated.
+	 It was allocated in the dynamic linker (i.e., with a different
+	 malloc), and in the static library it's in .bss space.  */
+      free_slotinfo (&GL(dl_tls_dtv_slotinfo_list)->next);
     }
 #endif
 }