Cleaned up 'struct link_map' and 'struct elf_resolve' such that the TLS data items are located in the same place. This allows for casting the types back and forth between the pthreads library and the dynamic loader. Cleaned up 'ldsodefs.h' and imported all of the functions from 'dl-tls.c' into the dynamic loader. Consequently, the dynamic loader grew in size by 50%. MIPS is probably the worst case as far as size, but still expect the other architectures to have a double digit percentage size increase.

1 files changed, 4 insertions, 7 deletions

diff --git a/include/link.h b/include/link.h
index be0b3b83b..5b0a13e60 100644
--- a/include/link.h
+++ b/include/link.h
@@ -25,8 +25,9 @@
 #include <elf.h>
 #include <dlfcn.h>
 #include <sys/types.h>
+/* Defines USE_TLS */
 #if defined(IS_IN_libpthread) || defined(IS_IN_rtld)
-#include <tls.h>		/* Defines USE_TLS.  */
+#include <tls.h>
 #endif
 
 /* We use this macro to refer to ELF types independent of the native wordsize.
@@ -114,12 +115,8 @@ struct link_map
     ptrdiff_t l_tls_offset;
     /* Index of the module in the dtv array.  */
     size_t l_tls_modid;
-    enum			/* Where this object came from.  */
-      {
-	lt_executable,		/* The main executable program.  */
-	lt_library,		/* Library needed by main executable.  */
-	lt_loaded		/* Extra run-time loaded shared object.  */
-      } l_type:2;
+    /* Nonzero if _dl_init_static_tls should be called for this module */
+    unsigned int l_need_tls_init:1;
 #endif
   };