Update.

	* elf/Makefile: Add rules to build and run tst-tls8.
	* elf/tst-tls8.c: New file.
	* elf/tst-tlsmod4.c: New file.

diff --git a/ChangeLog b/ChangeLog
index 35a35d2c1ea6ee6c4ebe1b2cab55c67abe0b6d8c..2b20e9a81f99968f4ffcee4f77bc96def6a0db81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-02-14  Ulrich Drepper  <drepper@redhat.com>
 
+       * elf/Makefile: Add rules to build and run tst-tls8.
+       * elf/tst-tls8.c: New file.
+       * elf/tst-tlsmod4.c: New file.
+
        * stdlib/test-a64l.c (tests): Add more test cases.
 
        * sunrpc/rtime.c (rtime): Change type of thetime to uint32_t.

diff --git a/elf/Makefile b/elf/Makefile
index b22f3afae30b6186fb6a8dc2d4527fbf2a6bebf3..595a0a7f397a71ea33a217909463994f59c11ac4 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -119,7 +119,7 @@ tests = loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
        $(tests-nodlopen-$(have-z-nodlopen)) neededtest neededtest2 \
        neededtest3 neededtest4 unload2 lateglobal initfirst global \
        restest2 next dblload dblunload reldep5 reldep6 tst-tls1 tst-tls2 \
-       tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7
+       tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8
 test-srcs = tst-pathopt
 tests-vis-yes = vismain
 tests-nodelete-yes = nodelete
@@ -137,7 +137,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
                unload2mod unload2dep ltglobmod1 ltglobmod2 pathoptobj \
                dblloadmod1 dblloadmod2 dblloadmod3 reldepmod5 reldepmod6 \
                reldep6mod0 reldep6mod1 reldep6mod2 reldep6mod3 reldep6mod4 \
-               tst-tlsmod1 tst-tlsmod2 tst-tlsmod3
+               tst-tlsmod1 tst-tlsmod2 tst-tlsmod3 tst-tlsmod4
 modules-vis-yes = vismod1 vismod2 vismod3
 modules-nodelete-yes = nodelmod1 nodelmod2 nodelmod3 nodelmod4
 modules-nodlopen-yes = nodlopenmod nodlopenmod2
@@ -455,3 +455,6 @@ $(objpfx)tst-tls6.out: $(objpfx)tst-tlsmod2.so
 
 $(objpfx)tst-tls7: $(libdl)
 $(objpfx)tst-tls7.out: $(objpfx)tst-tlsmod3.so
+
+$(objpfx)tst-tls8: $(libdl)
+$(objpfx)tst-tls8.out: $(objpfx)tst-tlsmod3.so $(objpfx)tst-tlsmod4.so

diff --git a/elf/tst-tls8.c b/elf/tst-tls8.c
new file mode 100644 (file)
index 0000000..971ee56
--- /dev/null
+++ b/elf/tst-tls8.c
@@ -0,0 +1,174 @@
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <link.h>
+#include <tls.h>
+
+
+#define TEST_FUNCTION do_test ()
+static int
+do_test (void)
+{
+#ifdef USE_TLS
+  static const char modname1[] = "tst-tlsmod3.so";
+  static const char modname2[] = "tst-tlsmod4.so";
+  int result = 0;
+  int (*fp1) (void);
+  int (*fp2) (int, int *);
+  void *h1;
+  void *h2;
+  int i;
+  int modid1 = -1;
+  int modid2 = -1;
+  int *bazp;
+
+  for (i = 0; i < 10; ++i)
+    {
+      h1 = dlopen (modname1, RTLD_LAZY);
+      if (h1 == NULL)
+       {
+         printf ("cannot open '%s': %s\n", modname1, dlerror ());
+         exit (1);
+       }
+
+      /* 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.  */
+      if (modid1 == -1)
+       modid1 = ((struct link_map *) h1)->l_tls_modid;
+      else if (((struct link_map *) h1)->l_tls_modid != modid1)
+       {
+         printf ("round %d: modid now %d, initially %d\n",
+                 i, ((struct link_map *) h1)->l_tls_modid, modid1);
+         result = 1;
+       }
+
+      fp1 = dlsym (h1, "in_dso2");
+      if (fp1 == NULL)
+       {
+         printf ("cannot get symbol 'in_dso2' in %s\n", modname1);
+         exit (1);
+       }
+
+      result |= fp1 ();
+
+
+
+      h2 = dlopen (modname2, RTLD_LAZY);
+      if (h2 == NULL)
+       {
+         printf ("cannot open '%s': %s\n", modname2, dlerror ());
+         exit (1);
+       }
+
+      /* 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.  */
+      if (modid2 == -1)
+       modid2 = ((struct link_map *) h1)->l_tls_modid;
+      else if (((struct link_map *) h1)->l_tls_modid != modid2)
+       {
+         printf ("round %d: modid now %d, initially %d\n",
+                 i, ((struct link_map *) h1)->l_tls_modid, modid2);
+         result = 1;
+       }
+
+      bazp = dlsym (h2, "baz");
+      if (bazp == NULL)
+       {
+         printf ("cannot get symbol 'baz' in %s\n", modname2);
+         exit (1);
+       }
+
+      *bazp = 42 + i;
+
+      fp2 = dlsym (h2, "in_dso");
+      if (fp2 == NULL)
+       {
+         printf ("cannot get symbol 'in_dso' in %s\n", modname2);
+         exit (1);
+       }
+
+      result |= fp2 (42 + i, bazp);
+
+      dlclose (h1);
+      dlclose (h2);
+
+
+      h1 = dlopen (modname1, RTLD_LAZY);
+      if (h1 == NULL)
+       {
+         printf ("cannot open '%s': %s\n", modname1, dlerror ());
+         exit (1);
+       }
+
+      /* 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.  */
+      if (((struct link_map *) h1)->l_tls_modid != modid1)
+       {
+         printf ("round %d: modid now %d, initially %d\n",
+                 i, ((struct link_map *) h1)->l_tls_modid, modid1);
+         result = 1;
+       }
+
+      fp1 = dlsym (h1, "in_dso2");
+      if (fp1 == NULL)
+       {
+         printf ("cannot get symbol 'in_dso2' in %s\n", modname1);
+         exit (1);
+       }
+
+      result |= fp1 ();
+
+
+
+      h2 = dlopen (modname2, RTLD_LAZY);
+      if (h2 == NULL)
+       {
+         printf ("cannot open '%s': %s\n", modname2, dlerror ());
+         exit (1);
+       }
+
+      /* 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.  */
+      if (((struct link_map *) h1)->l_tls_modid != modid2)
+       {
+         printf ("round %d: modid now %d, initially %d\n",
+                 i, ((struct link_map *) h1)->l_tls_modid, modid2);
+         result = 1;
+       }
+
+      bazp = dlsym (h2, "baz");
+      if (bazp == NULL)
+       {
+         printf ("cannot get symbol 'baz' in %s\n", modname2);
+         exit (1);
+       }
+
+      *bazp = 62 + i;
+
+      fp2 = dlsym (h2, "in_dso");
+      if (fp2 == NULL)
+       {
+         printf ("cannot get symbol 'in_dso' in %s\n", modname2);
+         exit (1);
+       }
+
+      result |= fp2 (62 + i, bazp);
+
+      /* This time the dlclose calls are in reverse order.  */
+      dlclose (h2);
+      dlclose (h1);
+    }
+
+  return result;
+#else
+  return 0;
+#endif
+}
+
+
+#include "../test-skeleton.c"

diff --git a/elf/tst-tlsmod3.c b/elf/tst-tlsmod3.c
index ff4a4460b98072267c1f4aafee84013c32bce3f2..087c11b7a02deb12920d33867944505710ec87db 100644 (file)
--- a/elf/tst-tlsmod3.c
+++ b/elf/tst-tlsmod3.c
@@ -1,9 +1,10 @@
 #include <stdio.h>
 
 #include <tls.h>
-#include "tls-macros.h"
 
 #ifdef USE_TLS
+# include "tls-macros.h"
+
 extern int in_dso (int n, int *caller_foop);
 
 COMMON_INT_DEF(comm_n);

diff --git a/elf/tst-tlsmod4.c b/elf/tst-tlsmod4.c
new file mode 100644 (file)
index 0000000..d40b3fd
--- /dev/null
+++ b/elf/tst-tlsmod4.c
@@ -0,0 +1,33 @@
+#include <stdio.h>
+
+#include <tls.h>
+
+#ifdef USE_TLS
+# include "tls-macros.h"
+
+
+COMMON_INT_DEF(baz);
+
+
+int
+in_dso (int n, int *caller_bazp)
+{
+  int *bazp = TLS_GD (baz);
+  int result = 0;
+
+  if (caller_bazp != NULL && bazp != caller_bazp)
+    {
+      printf ("callers address of baz differs: %p vs %p\n", caller_bazp, bazp);
+      result = 1;
+    }
+  else if (*bazp != n)
+    {
+      printf ("baz != %d\n", n);
+      result = 1;
+    }
+
+  *bazp = 16;
+
+  return result;
+}
+#endif