Miscellaneous format string fixes

	* elf.c (_bfd_elf_print_private_bfd_data): Use BFD_VMA_FMT to
	print d_tag.
	(bfd_elf_print_symbol): Don't cast symbol->flags.
	(_bfd_elf_symbol_from_bfd_symbol): Likewise.
	* elf32-ppc.c (ppc_elf_begin_write_processing): Correct
	_bfd_error_handler argument order.
	(ppc_elf_merge_private_bfd_data): Don't cast flags.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 271cc1caa402ccc42358bdc5ef030a386f9a0850..b1e5e65ca6c43ec9e49fbd8d78a381a8fad6fbb9 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2017-07-03  Alan Modra  <amodra@gmail.com>
+
+       * elf.c (_bfd_elf_print_private_bfd_data): Use BFD_VMA_FMT to
+       print d_tag.
+       (bfd_elf_print_symbol): Don't cast symbol->flags.
+       (_bfd_elf_symbol_from_bfd_symbol): Likewise.
+       * elf32-ppc.c (ppc_elf_begin_write_processing): Correct
+       _bfd_error_handler argument order.
+       (ppc_elf_merge_private_bfd_data): Don't cast flags.
+
 2017-07-03  Alan Modra  <amodra@gmail.com>
 
        * configure.ac: Invoke AC_CHECK_TYPES for long long.  Invoke

diff --git a/bfd/elf.c b/bfd/elf.c
index a238d392b4cc477218e074a3f6b46de238d6d898..9fec4b5026665a3c1d59fb90beaa66690288bc29 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -1669,7 +1669,7 @@ _bfd_elf_print_private_bfd_data (bfd *abfd, void *farg)
 
              if (!strcmp (name, ""))
                {
-                 sprintf (ab, "0x%lx", (unsigned long) dyn.d_tag);
+                 sprintf (ab, "%#" BFD_VMA_FMT "x", dyn.d_tag);
                  name = ab;
                }
              break;
@@ -1879,7 +1879,7 @@ bfd_elf_print_symbol (bfd *abfd,
     case bfd_print_symbol_more:
       fprintf (file, "elf ");
       bfd_fprintf_vma (abfd, file, symbol->value);
-      fprintf (file, " %lx", (unsigned long) symbol->flags);
+      fprintf (file, " %x", symbol->flags);
       break;
     case bfd_print_symbol_all:
       {
@@ -6426,8 +6426,8 @@ _bfd_elf_symbol_from_bfd_symbol (bfd *abfd, asymbol **asym_ptr_ptr)
 #if DEBUG & 4
   {
     fprintf (stderr,
-            "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8lx\n",
-            (long) asym_ptr, asym_ptr->name, idx, (long) flags);
+            "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8x\n",
+            (long) asym_ptr, asym_ptr->name, idx, flags);
     fflush (stderr);
   }
 #endif

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index a4814fcdbb8a9215a952c4444a7348ef10aa94df..0e992728eafe442d46ca93a027f79dabd6963b0d 100644 (file)
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -2849,7 +2849,7 @@ ppc_elf_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info)
     free (buffer);
 
   if (error_message)
-    _bfd_error_handler (error_message, ibfd, APUINFO_SECTION_NAME);
+    _bfd_error_handler (error_message, APUINFO_SECTION_NAME, ibfd);
 }
 
 /* Prevent the output section from accumulating the input sections'
@@ -4906,9 +4906,9 @@ ppc_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
          error = TRUE;
          _bfd_error_handler
            /* xgettext:c-format */
-           (_("%B: uses different e_flags (0x%lx) fields "
-              "than previous modules (0x%lx)"),
-            ibfd, (long) new_flags, (long) old_flags);
+           (_("%B: uses different e_flags (%#x) fields "
+              "than previous modules (%#x)"),
+            ibfd, new_flags, old_flags);
        }
 
       if (error)