mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-05 21:00:05 +00:00
216455bc28
members to the end, so a libpthread compiled with !USE_TLS will still find other members properly. * sysdeps/i386/i486/bits/string.h (__strcpy_g): Add dummy output operand for DEST memory. Fix dummy input operand to use SRC. Reported by Davin McCall <davmac@ozonline.com.au>. * sysdeps/generic/libc-tls.c (__libc_setup_tls): Account for TCB alignment when initializing the DTV entry. * elf/dl-load.c (_dl_map_object_from_fd): If we hit a TLS segment when TLS has not been set up, try to set it up if we can. * elf/tst-tls4.c: Revert last change. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * sysdeps/generic/dl-tls.c [SHARED] (_dl_tls_setup): New function. * sysdeps/generic/ldsodefs.h: Declare it. * elf/Versions (ld: GLIBC_PRIVATE): Add it. * sysdeps/generic/libc-tls.c (init_slotinfo): New static inline function, broken out of __libc_setup_tls. (init_static_tls): Likewise. (__libc_setup_tls): Call them. (_dl_tls_setup): New function, uses new subroutines. * elf/dl-close.c (free_slotinfo): Make argument pointer to pointer. Clear the pointer when returning true. (libc_freeres_fn) [SHARED]: If GL(dl_initial_dtv) is null, free the first element of the slotinfo list too. * sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): Define only if [SHARED]. * sysdeps/generic/ldsodefs.h (_dl_next_tls_modid): Declare as hidden. (_dl_determine_tlsoffset): Likewise. * elf/rtld.c (_dl_initial_error_catch_tsd): Renamed from startup_error_tsd, made global. (dl_main): Update initialization. * elf/dl-tsd.c: Likewise. * sysdeps/generic/ldsodefs.h: Declare it.
91 lines
1.7 KiB
C
91 lines
1.7 KiB
C
#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 modname[] = "tst-tlsmod2.so";
|
|
int result = 0;
|
|
int *foop;
|
|
int *foop2;
|
|
int (*fp) (int, int *);
|
|
void *h;
|
|
int i;
|
|
int modid = -1;
|
|
|
|
for (i = 0; i < 10; ++i)
|
|
{
|
|
h = dlopen (modname, RTLD_LAZY);
|
|
if (h == NULL)
|
|
{
|
|
printf ("cannot open '%s': %s\n", modname, 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 (modid == -1)
|
|
modid = ((struct link_map *) h)->l_tls_modid;
|
|
else if (((struct link_map *) h)->l_tls_modid != modid)
|
|
{
|
|
printf ("round %d: modid now %d, initially %d\n",
|
|
i, ((struct link_map *) h)->l_tls_modid, modid);
|
|
result = 1;
|
|
}
|
|
|
|
foop = dlsym (h, "foo");
|
|
if (foop == NULL)
|
|
{
|
|
printf ("cannot get symbol 'foo': %s\n", dlerror ());
|
|
exit (1);
|
|
}
|
|
|
|
*foop = 42 + i;
|
|
|
|
fp = dlsym (h, "in_dso");
|
|
if (fp == NULL)
|
|
{
|
|
printf ("cannot get symbol 'in_dso': %s\n", dlerror ());
|
|
exit (1);
|
|
}
|
|
|
|
result |= fp (42 + i, foop);
|
|
|
|
foop2 = dlsym (h, "foo");
|
|
if (foop2 == NULL)
|
|
{
|
|
printf ("cannot get symbol 'foo' the second time: %s\n", dlerror ());
|
|
exit (1);
|
|
}
|
|
|
|
if (foop != foop2)
|
|
{
|
|
puts ("address of 'foo' different the second time");
|
|
result = 1;
|
|
}
|
|
else if (*foop != 16)
|
|
{
|
|
puts ("foo != 16");
|
|
result = 1;
|
|
}
|
|
|
|
dlclose (h);
|
|
}
|
|
|
|
return result;
|
|
#else
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
|
|
#include "../test-skeleton.c"
|