svn commit: branches/uClibc-nptl/ldso/ldso

carmelo at uclibc.org carmelo at uclibc.org
Mon Aug 4 12:15:03 UTC 2008


Author: carmelo
Date: 2008-08-04 05:15:02 -0700 (Mon, 04 Aug 2008)
New Revision: 23010

Log:
Revert recent changes to previous version at rev 20454.
Functionally the code is the same, just a matter of coding style.

Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>


Modified:
   branches/uClibc-nptl/ldso/ldso/dl-tls.c


Changeset:
Modified: branches/uClibc-nptl/ldso/ldso/dl-tls.c
===================================================================
--- branches/uClibc-nptl/ldso/ldso/dl-tls.c	2008-08-04 00:46:07 UTC (rev 23009)
+++ branches/uClibc-nptl/ldso/ldso/dl-tls.c	2008-08-04 12:15:02 UTC (rev 23010)
@@ -998,19 +998,18 @@
 
 	/* Fill in the information from the loaded modules.  No namespace
 	   but the base one can be filled at this time.  */
-	int i = 1;                  /* The first module ID is 1. */
-	struct elf_resolve *l;
-	for (l =  _dl_loaded_modules; l != NULL; l = l->next)
+	int i = 0;
+	struct link_map *l;
+	for (l =  (struct link_map *) _dl_loaded_modules; l != NULL; l = l->l_next)
 		if (l->l_tls_blocksize != 0)
 		{
 			/* This is a module with TLS data.  Store the map reference.
 			   The generation counter is zero.  */
-			_dl_assert (i == l->l_tls_modid);
-			slotinfo[i].map = (struct link_map *) l;
-			/* slotinfo[i].gen = 0; */
-			i++;
+
+			/* Skeep slot[0]: it will be never used */			
+			slotinfo[++i].map = l;
 		}
-	_dl_assert (i == _dl_tls_max_dtv_idx + 1);
+	_dl_assert (i == _dl_tls_max_dtv_idx);
 
 	/* Compute the TLS offsets for the various blocks.  */
 	_dl_determine_tlsoffset ();




More information about the uClibc-cvs mailing list