aboutsummaryrefslogtreecommitdiff
path: root/dlfcn/dlinfo.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-03-01 06:18:49 +0000
committerRoland McGrath <roland@gnu.org>2006-03-01 06:18:49 +0000
commitd78efd9f369a8fc46229fc9224e10e3781eecc43 (patch)
tree2ab775602fdf94ce710efb518002de4a93bfab0e /dlfcn/dlinfo.c
parent0b890d59bd75cb8ab9232ab72ed8674054e11fa3 (diff)
downloadglibc-d78efd9f369a8fc46229fc9224e10e3781eecc43.zip
glibc-d78efd9f369a8fc46229fc9224e10e3781eecc43.tar.gz
glibc-d78efd9f369a8fc46229fc9224e10e3781eecc43.tar.bz2
* elf/tst-tls-dlinfo.c: New file.
* 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.
Diffstat (limited to 'dlfcn/dlinfo.c')
-rw-r--r--dlfcn/dlinfo.c24
1 files changed, 23 insertions, 1 deletions
diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c
index 44af55a..b1e2b00 100644
--- a/dlfcn/dlinfo.c
+++ b/dlfcn/dlinfo.c
@@ -1,5 +1,5 @@
/* dlinfo -- Get information from the dynamic linker.
- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -32,6 +32,10 @@ dlinfo (void *handle, int request, void *arg)
#else
+# ifdef USE_TLS
+# include <dl-tls.h>
+# endif
+
struct dlinfo_args
{
ElfW(Addr) caller;
@@ -90,6 +94,24 @@ RTLD_SELF used in code not dynamically loaded"));
case RTLD_DI_ORIGIN:
strcpy (args->arg, l->l_origin);
break;
+
+ case RTLD_DI_TLS_MODID:
+ *(size_t *) args->arg = 0;
+#ifdef USE_TLS
+ *(size_t *) args->arg = l->l_tls_modid;
+#endif
+ break;
+
+ case RTLD_DI_TLS_DATA:
+ {
+ void *data = NULL;
+#ifdef USE_TLS
+ if (l->l_tls_modid != 0)
+ data = _dl_tls_get_addr_soft (l);
+#endif
+ *(void **) args->arg = data;
+ break;
+ }
}
}