Handle multiple target events before commit resume

[deliverable/binutils-gdb.git] / bfd / coff-ppc.c

diff --git a/bfd/coff-ppc.c b/bfd/coff-ppc.c
index 8cdfd80343b0c7072dc4eef0b83f839f3b0dc94f..ab5c2c837c10e10b317261a6488b916535ff7edb 100644 (file)
--- a/bfd/coff-ppc.c
+++ b/bfd/coff-ppc.c
@@ -1,5 +1,5 @@
 /* BFD back-end for PowerPC Microsoft Portable Executable files.
-   Copyright (C) 1990-2018 Free Software Foundation, Inc.
+   Copyright (C) 1990-2019 Free Software Foundation, Inc.
 
    Original version pieced together by Kim Knuttila (krk@cygnus.com)
 
@@ -1038,9 +1038,9 @@ coff_ppc_relocate_section (bfd *output_bfd,
       switch (r_type)
        {
        default:
-         _bfd_error_handler
-           /* xgettext: c-format */
-           (_("%pB: unsupported relocation type 0x%02x"), input_bfd, r_type);
+         /* xgettext: c-format */
+         _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+                             input_bfd, r_type);
          bfd_set_error (bfd_error_bad_value);
          return FALSE;
        case IMAGE_REL_PPC_TOCREL16:
@@ -1131,9 +1131,9 @@ coff_ppc_relocate_section (bfd *output_bfd,
                      {
                        _bfd_error_handler
                          /* xgettext: c-format */
-                         (_("%pB: Relocation for %s of %#Lx exceeds "
+                         (_("%pB: Relocation for %s of %#" PRIx64 " exceeds "
                             "Toc size limit"),
-                          input_bfd, name, our_toc_offset);
+                          input_bfd, name, (uint64_t) our_toc_offset);
                        bfd_set_error (bfd_error_bad_value);
                        return FALSE;
                      }
@@ -1185,8 +1185,8 @@ coff_ppc_relocate_section (bfd *output_bfd,
              {
                _bfd_error_handler
                  /* xgettext: c-format */
-                 (_("%pB: Relocation exceeds allocated TOC (%#Lx)"),
-                  input_bfd, toc_section->size);
+                 (_("%pB: Relocation exceeds allocated TOC (%#" PRIx64 ")"),
+                  input_bfd, (uint64_t) toc_section->size);
                bfd_set_error (bfd_error_bad_value);
                return FALSE;
              }
@@ -1240,10 +1240,11 @@ coff_ppc_relocate_section (bfd *output_bfd,
 
            _bfd_error_handler
              /* xgettext: c-format */
-             (_("Warning: unsupported reloc %s <file %pB, section %pA>\n"
-                "sym %ld (%s), r_vaddr %Ld (%#Lx)"),
+             (_("warning: unsupported reloc %s <file %pB, section %pA>\n"
+                "sym %ld (%s), r_vaddr %" PRId64 " (%#" PRIx64 ")"),
               howto->name, input_bfd, input_section,
-              rel->r_symndx, my_name, rel->r_vaddr, rel->r_vaddr);
+              rel->r_symndx, my_name,
+              (int64_t) rel->r_vaddr, (uint64_t) rel->r_vaddr);
          }
          break;
        case IMAGE_REL_PPC_IMGLUE:
@@ -2419,9 +2420,9 @@ ppc_bfd_coff_final_link (bfd *abfd, struct bfd_link_info *info)
 
   _bfd_stringtab_free (flaginfo.strtab);
 
-  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
+  /* Setting symcount to 0 will cause write_object_contents to
      not try to write out the symbols.  */
-  bfd_get_symcount (abfd) = 0;
+  abfd->symcount = 0;
 
   return TRUE;