summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2006-07-13 03:59:46 +0000
committerRoland McGrath <roland@redhat.com>2006-07-13 03:59:46 +0000
commit4ec807ec38ea145b15e2d8d996e05d852c7e7fde (patch)
tree28d2fd55d49c0ffb7a10222dbb03560da9e782e0
parentf48d0b05bdcc9a99585229b8d733fce2b383a51e (diff)
downloadelfutils-4ec807ec38ea145b15e2d8d996e05d852c7e7fde.tar.gz
2006-07-12 Roland McGrath <roland@redhat.com>
* readelf.c (handle_gnu_hash): Add casts for machines where Elf32_Word != unsigned int.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/readelf.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c588cbcf..358de01f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-12 Roland McGrath <roland@redhat.com>
+
+ * readelf.c (handle_gnu_hash): Add casts for machines where
+ Elf32_Word != unsigned int.
+
2006-07-12 Ulrich Drepper <drepper@redhat.com>
* elflint.c (check_sysv_hash64): Fix printf format.
diff --git a/src/readelf.c b/src/readelf.c
index eba6dd81..ac313d00 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -2534,9 +2534,10 @@ handle_gnu_hash (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr, size_t shstrndx)
if (asprintf (&str, gettext ("\
Symbol Bias: %u\n\
Bitmask Size: %zu bytes %" PRIuFAST32 "%% bits set 2nd hash shift: %u\n"),
- symbias, bitmask_words * sizeof (Elf32_Word),
- (nbits * 100 + 50) / (bitmask_words * sizeof (Elf32_Word) * 8),
- shift) == -1)
+ (unsigned int) symbias, bitmask_words * sizeof (Elf32_Word),
+ ((nbits * 100 + 50)
+ / (uint_fast32_t) (bitmask_words * sizeof (Elf32_Word) * 8)),
+ (unsigned int) shift) == -1)
error (EXIT_FAILURE, 0, gettext ("memory exhausted"));
print_hash_info (ebl, scn, shdr, shstrndx, maxlength, nbucket, nsyms,