|
@@ -29,31 +29,6 @@ do_test (void)
|
|
|
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. */
|
|
|
-#ifdef __UCLIBC__
|
|
|
- if (modid1 == (size_t) -1)
|
|
|
- modid1 = ((struct dyn_elf *) h1)->dyn->l_tls_modid;
|
|
|
- else if (((struct dyn_elf *)h1)->dyn->l_tls_modid != (size_t) modid1)
|
|
|
- {
|
|
|
- printf ("round %d: modid now %zd, initially %zd\n",
|
|
|
- i,
|
|
|
- ((struct dyn_elf *)h1)->dyn->l_tls_modid,
|
|
|
- modid1);
|
|
|
- result = 1;
|
|
|
- }
|
|
|
-#else
|
|
|
- if (modid1 == (size_t) -1)
|
|
|
- modid1 = ((struct link_map *) h1)->l_tls_modid;
|
|
|
- else if (((struct link_map *) h1)->l_tls_modid != modid1)
|
|
|
- {
|
|
|
- printf ("round %d: modid now %zd, initially %zd\n",
|
|
|
- i, ((struct link_map *) h1)->l_tls_modid, modid1);
|
|
|
- result = 1;
|
|
|
- }
|
|
|
-#endif
|
|
|
-
|
|
|
fp1 = dlsym (h1, "in_dso2");
|
|
|
if (fp1 == NULL)
|
|
|
{
|
|
@@ -72,32 +47,6 @@ do_test (void)
|
|
|
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. */
|
|
|
-#ifdef __UCLIBC__
|
|
|
- if (modid2 == (size_t) -1)
|
|
|
- modid2 = ((struct dyn_elf *)h2)->dyn->l_tls_modid;
|
|
|
- else if (((struct dyn_elf *)h2)->dyn->l_tls_modid
|
|
|
- != (size_t) modid2)
|
|
|
- {
|
|
|
- printf ("round %d: modid now %zd, initially %zd\n",
|
|
|
- i,
|
|
|
- ((struct dyn_elf *)h2)->dyn->l_tls_modid,
|
|
|
- modid2);
|
|
|
- result = 1;
|
|
|
- }
|
|
|
-#else
|
|
|
- if (modid2 == (size_t) -1)
|
|
|
- modid2 = ((struct link_map *) h2)->l_tls_modid;
|
|
|
- else if (((struct link_map *) h2)->l_tls_modid != modid2)
|
|
|
- {
|
|
|
- printf ("round %d: modid now %zd, initially %zd\n",
|
|
|
- i, ((struct link_map *) h2)->l_tls_modid, modid2);
|
|
|
- result = 1;
|
|
|
- }
|
|
|
-#endif
|
|
|
-
|
|
|
bazp = dlsym (h2, "baz");
|
|
|
if (bazp == NULL)
|
|
|
{
|
|
@@ -127,28 +76,6 @@ do_test (void)
|
|
|
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. */
|
|
|
-#ifdef __UCLIBC__
|
|
|
- if (((struct dyn_elf *)h1)->dyn->l_tls_modid
|
|
|
- != modid1)
|
|
|
- {
|
|
|
- printf ("round %d: modid now %zd, initially %zd\n",
|
|
|
- i,
|
|
|
- ((struct dyn_elf *)h1)->dyn->l_tls_modid,
|
|
|
- modid1);
|
|
|
- result = 1;
|
|
|
- }
|
|
|
-#else
|
|
|
- if (((struct link_map *) h1)->l_tls_modid != modid1)
|
|
|
- {
|
|
|
- printf ("round %d: modid now %zd, initially %zd\n",
|
|
|
- i, ((struct link_map *) h1)->l_tls_modid, modid1);
|
|
|
- result = 1;
|
|
|
- }
|
|
|
-#endif
|
|
|
-
|
|
|
fp1 = dlsym (h1, "in_dso2");
|
|
|
if (fp1 == NULL)
|
|
|
{
|
|
@@ -167,28 +94,6 @@ do_test (void)
|
|
|
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. */
|
|
|
-#ifdef __UCLIBC__
|
|
|
- if (((struct dyn_elf *)h2)->dyn->l_tls_modid
|
|
|
- != modid2)
|
|
|
- {
|
|
|
- printf ("round %d: modid now %zd, initially %zd\n",
|
|
|
- i,
|
|
|
- ((struct dyn_elf *)h2)->dyn->l_tls_modid,
|
|
|
- modid2);
|
|
|
- result = 1;
|
|
|
- }
|
|
|
-#else
|
|
|
- if (((struct link_map *) h2)->l_tls_modid != modid2)
|
|
|
- {
|
|
|
- printf ("round %d: modid now %zd, initially %zd\n",
|
|
|
- i, ((struct link_map *) h2)->l_tls_modid, modid2);
|
|
|
- result = 1;
|
|
|
- }
|
|
|
-#endif
|
|
|
-
|
|
|
bazp = dlsym (h2, "baz");
|
|
|
if (bazp == NULL)
|
|
|
{
|