From: Alan Modra <amodra@gmail.com>
Date: Fri, 28 Nov 2014 03:59:23 +0000 (+1030)
Subject: Fix build breakage on 32-bit targets with 64-bit bfd
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8066deb11b8e23de5c75e3e2526524bdef0f5a41;p=binutils-gdb.git

Fix build breakage on 32-bit targets with 64-bit bfd

	* readelf.c (get_32bit_elf_symbols): Cast bfd_size_type values to
	unsigned long for %lx.
	(get_64bit_elf_symbols, process_section_groups): Likewise.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 709c1cc6055..a0f688966f9 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-28  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c (get_32bit_elf_symbols): Cast bfd_size_type values to
+	unsigned long for %lx.
+	(get_64bit_elf_symbols, process_section_groups): Likewise.
+
 2014-11-27  Espen Grindhaug <espen@grindhaug.org>
 	    Nick Clifton  <nickc@redhat.com>
 
diff --git a/binutils/readelf.c b/binutils/readelf.c
index c00b62b908e..a6d563fbf5e 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -4787,7 +4787,9 @@ get_32bit_elf_symbols (FILE * file,
   if (number * sizeof (Elf32_External_Sym) > section->sh_size + 1)
     {
       error (_("Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n"),
-	     section->sh_size, printable_section_name (section), section->sh_entsize);
+	     (unsigned long) section->sh_size,
+	     printable_section_name (section),
+	     (unsigned long) section->sh_entsize);
       goto exit_point;
     }
 
@@ -4877,14 +4879,16 @@ get_64bit_elf_symbols (FILE * file,
   if (section->sh_entsize == 0 || section->sh_entsize > section->sh_size)
     {
       error (_("Section %s has an invalid sh_entsize of 0x%lx\n"),
-	     printable_section_name (section), (unsigned long) section->sh_entsize);
+	     printable_section_name (section),
+	     (unsigned long) section->sh_entsize);
       goto exit_point;
     }
 
   if (section->sh_size > current_file_size)
     {
       error (_("Section %s has an invalid sh_size of 0x%lx\n"),
-	     printable_section_name (section), (unsigned long) section->sh_size);
+	     printable_section_name (section),
+	     (unsigned long) section->sh_size);
       goto exit_point;
     }
 
@@ -4893,7 +4897,9 @@ get_64bit_elf_symbols (FILE * file,
   if (number * sizeof (Elf64_External_Sym) > section->sh_size + 1)
     {
       error (_("Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n"),
-	     section->sh_size, printable_section_name (section), section->sh_entsize);
+	     (unsigned long) section->sh_size,
+	     printable_section_name (section),
+	     (unsigned long) section->sh_entsize);
       goto exit_point;
     }
 
@@ -5840,7 +5846,8 @@ process_section_groups (FILE * file)
 	    {
 	      error (_("Section %s has sh_entsize (0x%lx) which is larger than its size (0x%lx)\n"),
 		     printable_section_name (section),
-		     section->sh_entsize, section->sh_size);
+		     (unsigned long) section->sh_entsize,
+		     (unsigned long) section->sh_size);
 	      break;
 	    }