mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 16:21:07 +00:00
d78efd9f36
* elf/Makefile (tests): Add it. ($(objpfx)tst-tls-dlinfo): Depend on $(libdl). ($(objpfx)tst-tls-dlinfo.out): Depend on $(objpfx)tst-tlsmod2.so. * dlfcn/dlfcn.h (RTLD_DI_PROFILENAME, RTLD_DI_PROFILEOUT): New enum values, reserve unsupported requested names used on Solaris. (RTLD_DI_TLS_MODID, RTLD_DI_TLS_DATA): New enum values. (RTLD_DI_MAX): Likewise. * dlfcn/dlinfo.c (dlinfo_doit): Handle RTLD_DI_TLS_MODID and RTLD_DI_TLS_DATA. * elf/dl-tls.c (_dl_tls_get_addr_soft): New function. * sysdeps/generic/ldsodefs.h: Declare it. * elf/Versions (ld: GLIBC_PRIVATE): Add it. * elf/link.h (struct dl_phdr_info): New members dlpi_tls_modid, dlpi_tls_data. * elf/dl-iteratephdr.c (__dl_iterate_phdr): Fill them in. * include/link.h: Don't copy contents from elf/link.h. Instead, #include it while #define'ing around link_map. * elf/dl-debug.c (_dl_debug_initialize): Add a cast. Add bogus extern decl to verify link_map members. * elf/loadtest.c (MAPS): New macro, cast _r_debug._r_map. (OUT, main): Use it in place of _r_debug._r_map. * elf/unload.c: Likewise. * elf/unload2.c: Likewise. * elf/neededtest.c (check_loaded_objects): Likewise. * elf/neededtest2.c (check_loaded_objects): Likewise. * elf/neededtest3.c (check_loaded_objects): Likewise. * elf/neededtest4.c (check_loaded_objects): Likewise. * elf/circleload1.c (check_loaded_objects): Likewise.
93 lines
1.8 KiB
C
93 lines
1.8 KiB
C
#include <dlfcn.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.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 (*fp) (int, int *);
|
|
void *h;
|
|
|
|
h = dlopen (modname, RTLD_LAZY);
|
|
if (h == NULL)
|
|
{
|
|
printf ("cannot open '%s': %s\n", modname, dlerror ());
|
|
exit (1);
|
|
}
|
|
|
|
fp = dlsym (h, "in_dso");
|
|
if (fp == NULL)
|
|
{
|
|
printf ("cannot get symbol 'in_dso': %s\n", dlerror ());
|
|
exit (1);
|
|
}
|
|
|
|
size_t modid = -1;
|
|
if (dlinfo (h, RTLD_DI_TLS_MODID, &modid))
|
|
{
|
|
printf ("dlinfo RTLD_DI_TLS_MODID failed: %s\n", dlerror ());
|
|
result = 1;
|
|
}
|
|
else
|
|
printf ("dlinfo says TLS module ID %Zu\n", modid);
|
|
|
|
void *block;
|
|
if (dlinfo (h, RTLD_DI_TLS_DATA, &block))
|
|
{
|
|
printf ("dlinfo RTLD_DI_TLS_DATA failed: %s\n", dlerror ());
|
|
result = 1;
|
|
}
|
|
else if (block != NULL)
|
|
{
|
|
printf ("dlinfo RTLD_DI_TLS_DATA says %p but should be unallocated\n",
|
|
block);
|
|
result = 1;
|
|
}
|
|
|
|
result |= fp (0, NULL);
|
|
|
|
foop = dlsym (h, "foo");
|
|
if (foop == NULL)
|
|
{
|
|
printf ("cannot get symbol 'foo' the second time: %s\n", dlerror ());
|
|
exit (1);
|
|
}
|
|
if (*foop != 16)
|
|
{
|
|
puts ("foo != 16");
|
|
result = 1;
|
|
}
|
|
|
|
/* Now the module's TLS block has been used and should appear. */
|
|
if (dlinfo (h, RTLD_DI_TLS_DATA, &block))
|
|
{
|
|
printf ("dlinfo RTLD_DI_TLS_DATA failed the second time: %s\n",
|
|
dlerror ());
|
|
result = 1;
|
|
}
|
|
else if (block != foop)
|
|
{
|
|
printf ("dlinfo RTLD_DI_TLS_DATA says %p but should be %p\n",
|
|
block, foop);
|
|
result = 1;
|
|
}
|
|
|
|
dlclose (h);
|
|
|
|
return result;
|
|
#else
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
|
|
#include "../test-skeleton.c"
|