2006-07-12 Roland McGrath <roland@redhat.com>

	* readelf.c (handle_gnu_hash): Add casts for machines where
	Elf32_Word != unsigned int.

diff --git a/src/ChangeLog b/src/ChangeLog
index c588cbcfbf0d7cac6244475baf478e29bc519857..358de01f837c6d1befc7ab9f6383c83cd27ed542 100644 (file)
--- 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 eba6dd81bb2023da9645e5472aeddf1f4df71d12..ac313d00c3c129be2d75a6a0f1d80fdecb937ed0 100644 (file)
--- 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,