diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-lookup.c | 13 | ||||
| -rw-r--r-- | elf/rtld.c | 15 | ||||
| -rw-r--r-- | elf/tst-tls6.c | 2 | ||||
| -rw-r--r-- | elf/tst-tls8.c | 8 |
4 files changed, 21 insertions, 17 deletions
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 2b7473662f..9d9a12efbf 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -704,20 +704,21 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map, { _dl_printf ("%s 0x%0*Zx 0x%0*Zx -> 0x%0*Zx 0x%0*Zx ", conflict ? "conflict" : "lookup", - (int) sizeof (ElfW(Addr)) * 2, undef_map->l_map_start, (int) sizeof (ElfW(Addr)) * 2, - ((ElfW(Addr)) *ref) - undef_map->l_map_start, + (size_t) undef_map->l_map_start, (int) sizeof (ElfW(Addr)) * 2, - (ElfW(Addr)) (value->s ? value->m->l_map_start : 0), + (size_t) (((ElfW(Addr)) *ref) - undef_map->l_map_start), (int) sizeof (ElfW(Addr)) * 2, - (ElfW(Addr)) (value->s ? value->s->st_value : 0)); + (size_t) (value->s ? value->m->l_map_start : 0), + (int) sizeof (ElfW(Addr)) * 2, + (size_t) (value->s ? value->s->st_value : 0)); if (conflict) _dl_printf ("x 0x%0*Zx 0x%0*Zx ", (int) sizeof (ElfW(Addr)) * 2, - (ElfW(Addr)) (val.s ? val.m->l_map_start : 0), + (size_t) (val.s ? val.m->l_map_start : 0), (int) sizeof (ElfW(Addr)) * 2, - (ElfW(Addr)) (val.s ? val.s->st_value : 0)); + (size_t) (val.s ? val.s->st_value : 0)); _dl_printf ("/%x %s\n", type_class, undef_name); } diff --git a/elf/rtld.c b/elf/rtld.c index 54e568804d..c52909457d 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1307,13 +1307,15 @@ cannot allocate TLS data structures for initial thread"); : rtld_progname ?: "<main program>", l->l_name[0] ? l->l_name : rtld_progname ?: "<main program>", - (int) sizeof l->l_map_start * 2, l->l_map_start, - (int) sizeof l->l_addr * 2, l->l_addr); + (int) sizeof l->l_map_start * 2, + (size_t) l->l_map_start, + (int) sizeof l->l_addr * 2, + (size_t) l->l_addr); #ifdef USE_TLS if (l->l_tls_modid) _dl_printf (" TLS(0x%Zx, 0x%0*Zx)\n", l->l_tls_modid, (int) sizeof l->l_tls_offset * 2, - l->l_tls_offset); + (size_t) l->l_tls_offset); else #endif _dl_printf ("\n"); @@ -1330,7 +1332,7 @@ cannot allocate TLS data structures for initial thread"); else _dl_printf ("\t%s => %s (0x%0*Zx)\n", l->l_libname->name, l->l_name, (int) sizeof l->l_map_start * 2, - l->l_map_start); + (size_t) l->l_map_start); } if (__builtin_expect (mode, trace) != trace) @@ -1349,8 +1351,9 @@ cannot allocate TLS data structures for initial thread"); _dl_printf ("%s found at 0x%0*Zd in object at 0x%0*Zd\n", INTUSE(_dl_argv)[i], - (int) sizeof ref->st_value * 2, ref->st_value, - (int) sizeof loadbase * 2, loadbase); + (int) sizeof ref->st_value * 2, + (size_t) ref->st_value, + (int) sizeof loadbase * 2, (size_t) loadbase); } else { diff --git a/elf/tst-tls6.c b/elf/tst-tls6.c index 2c015efebb..68d706538f 100644 --- a/elf/tst-tls6.c +++ b/elf/tst-tls6.c @@ -36,7 +36,7 @@ do_test (void) 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", + printf ("round %d: modid now %zd, initially %d\n", i, ((struct link_map *) h)->l_tls_modid, modid); result = 1; } diff --git a/elf/tst-tls8.c b/elf/tst-tls8.c index 97b4a25652..dd896c4937 100644 --- a/elf/tst-tls8.c +++ b/elf/tst-tls8.c @@ -39,7 +39,7 @@ do_test (void) 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 %d\n", + printf ("round %d: modid now %zd, initially %zd\n", i, ((struct link_map *) h1)->l_tls_modid, modid1); result = 1; } @@ -69,7 +69,7 @@ do_test (void) modid2 = ((struct link_map *) h1)->l_tls_modid; else if (((struct link_map *) h1)->l_tls_modid != modid2) { - printf ("round %d: modid now %zd, initially %d\n", + printf ("round %d: modid now %zd, initially %zd\n", i, ((struct link_map *) h1)->l_tls_modid, modid2); result = 1; } @@ -108,7 +108,7 @@ do_test (void) time. The value of the first round is used. */ if (((struct link_map *) h1)->l_tls_modid != modid1) { - printf ("round %d: modid now %zd, initially %d\n", + printf ("round %d: modid now %zd, initially %zd\n", i, ((struct link_map *) h1)->l_tls_modid, modid1); result = 1; } @@ -136,7 +136,7 @@ do_test (void) time. The value of the first round is used. */ if (((struct link_map *) h1)->l_tls_modid != modid2) { - printf ("round %d: modid now %zd, initially %d\n", + printf ("round %d: modid now %zd, initially %zd\n", i, ((struct link_map *) h1)->l_tls_modid, modid2); result = 1; } |