diff options
| author | Roland McGrath <roland@gnu.org> | 2006-03-01 06:18:49 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2006-03-01 06:18:49 +0000 |
| commit | d78efd9f369a8fc46229fc9224e10e3781eecc43 (patch) | |
| tree | 2ab775602fdf94ce710efb518002de4a93bfab0e /elf/loadtest.c | |
| parent | 0b890d59bd75cb8ab9232ab72ed8674054e11fa3 (diff) | |
| download | glibc-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 'elf/loadtest.c')
| -rw-r--r-- | elf/loadtest.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/elf/loadtest.c b/elf/loadtest.c index ee106ea..727469b 100644 --- a/elf/loadtest.c +++ b/elf/loadtest.c @@ -70,8 +70,10 @@ static const struct #include <include/link.h> +#define MAPS ((struct link_map *) _r_debug.r_map) + #define OUT \ - for (map = _r_debug.r_map; map != NULL; map = map->l_next) \ + for (map = MAPS; map != NULL; map = map->l_next) \ if (map->l_type == lt_loaded) \ printf ("name = \"%s\", direct_opencount = %d\n", \ map->l_name, (int) map->l_direct_opencount); \ @@ -147,7 +149,7 @@ main (int argc, char *argv[]) { /* In this case none of the objects above should be present. */ - for (map = _r_debug.r_map; map != NULL; map = map->l_next) + for (map = MAPS; map != NULL; map = map->l_next) if (map->l_type == lt_loaded && (strstr (map->l_name, testobjs[0].name) != NULL || strstr (map->l_name, testobjs[1].name) != NULL @@ -180,7 +182,7 @@ main (int argc, char *argv[]) } /* Check whether all files are unloaded. */ - for (map = _r_debug.r_map; map != NULL; map = map->l_next) + for (map = MAPS; map != NULL; map = map->l_next) if (map->l_type == lt_loaded) { printf ("name = \"%s\", direct_opencount = %d\n", |