svn commit: branches/uClibc-nptl/test/tls

[sjhill at uclibc.org]

Author: sjhill
Date: 2007-11-28 21:06:45 -0800 (Wed, 28 Nov 2007)
New Revision: 20574

Log:
Revert change to this test as it compiles without extra includes and 
matches the glibc test.


Modified:
   branches/uClibc-nptl/test/tls/tst-tls6.c


Changeset:
Modified: branches/uClibc-nptl/test/tls/tst-tls6.c
===================================================================
--- branches/uClibc-nptl/test/tls/tst-tls6.c	2007-11-29 05:01:01 UTC (rev 20573)
+++ branches/uClibc-nptl/test/tls/tst-tls6.c	2007-11-29 05:06:45 UTC (rev 20574)
@@ -4,10 +4,6 @@
 
 #include <link.h>
 #include <tls.h>
-#ifdef __UCLIBC__
-#include "dl-elf.h"
-#include "dl-hash.h"
-#endif
 
 
 #define TEST_FUNCTION do_test ()
@@ -36,20 +32,7 @@
       /* Dirty test code here: we peek into a private data structure.
 	 We make sure that the module gets assigned the same ID every
 	 time.  The value of the first round is used.  */
-#ifdef __UCLIBC__
       if (modid == -1)
-	modid = ((struct link_map *)((struct dyn_elf *)h)->dyn)->l_tls_modid;
-      else if (((struct link_map *)((struct dyn_elf *)h)->dyn)->l_tls_modid
-        != (size_t) modid)
-	{
-	  printf ("round %d: modid now %zu, initially %d\n",
-		  i,
-		  ((struct link_map *)((struct dyn_elf *)h)->dyn)->l_tls_modid,
-		  modid);
-	  result = 1;
-	}
-#else 
-      if (modid == -1)
 	modid = ((struct link_map *) h)->l_tls_modid;
       else if (((struct link_map *) h)->l_tls_modid != modid)
 	{
@@ -57,7 +40,6 @@
 		  i, ((struct link_map *) h)->l_tls_modid, modid);
 	  result = 1;
 	}
-#endif
 
       foop = dlsym (h, "foo");
       if (foop == NULL)