gdb/doc: Clarify vCont packet description

[binutils-gdb.git] / bfd / elf64-mmix.c

diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
index b15ef9f9bb375b346e12debfeca53463e583a521..d0c8db43d7c34dd4612d096510cfa121b3f86e37 100644 (file)
--- a/bfd/elf64-mmix.c
+++ b/bfd/elf64-mmix.c
@@ -172,7 +172,7 @@ extern void mmix_elf_symbol_processing (bfd *, asymbol *);
 
 /* Only intended to be called from a debugger.  */
 extern void mmix_dump_bpo_gregs
-  (struct bfd_link_info *, bfd_error_handler_type);
+  (struct bfd_link_info *, void (*) (const char *, ...));
 
 static void
 mmix_set_relaxable_size (bfd *, asection *, void *);
@@ -1190,7 +1190,8 @@ mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto,
           doesn't cost much, so can be left in at all times.  */
        if (value != gregdata->reloc_request[bpo_index].value)
          {
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: Internal inconsistency error for value for\n\
  linker-allocated global register: linked: 0x%lx%08lx != relaxed: 0x%lx%08lx\n"),
               bfd_get_filename (isec->owner),
@@ -1261,6 +1262,7 @@ mmix_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
   r_type = ELF64_R_TYPE (dst->r_info);
   if (r_type >= (unsigned int) R_MMIX_max)
     {
+      /* xgettext:c-format */
       _bfd_error_handler (_("%B: invalid MMIX reloc number: %d"), abfd, r_type);
       r_type = 0;
     }
@@ -1516,13 +1518,12 @@ mmix_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 
       if (r != bfd_reloc_ok)
        {
-         bfd_boolean check_ok = TRUE;
          const char * msg = (const char *) NULL;
 
          switch (r)
            {
            case bfd_reloc_overflow:
-             check_ok = info->callbacks->reloc_overflow
+             info->callbacks->reloc_overflow
                (info, (h ? &h->root : NULL), name, howto->name,
                 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
              break;
@@ -1530,9 +1531,8 @@ mmix_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
            case bfd_reloc_undefined:
              /* We may have sent this message above.  */
              if (! undefined_signalled)
-               check_ok = info->callbacks->undefined_symbol
-                 (info, name, input_bfd, input_section, rel->r_offset,
-                  TRUE);
+               info->callbacks->undefined_symbol
+                 (info, name, input_bfd, input_section, rel->r_offset, TRUE);
              undefined_signalled = TRUE;
              break;
 
@@ -1554,11 +1554,8 @@ mmix_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
            }
 
          if (msg)
-           check_ok = info->callbacks->warning
-             (info, msg, name, input_bfd, input_section, rel->r_offset);
-
-         if (! check_ok)
-           return FALSE;
+           (*info->callbacks->warning) (info, msg, name, input_bfd,
+                                        input_section, rel->r_offset);
        }
     }
 
@@ -1616,12 +1613,14 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section,
          /* Note: This is separated out into two messages in order
             to ease the translation into other languages.  */
          if (symname == NULL || *symname == 0)
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: base-plus-offset relocation against register symbol: (unknown) in %s"),
               bfd_get_filename (input_section->owner),
               bfd_get_section_name (symsec->owner, symsec));
          else
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: base-plus-offset relocation against register symbol: %s in %s"),
               bfd_get_filename (input_section->owner), symname,
               bfd_get_section_name (symsec->owner, symsec));
@@ -1665,12 +1664,14 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section,
          /* Note: This is separated out into two messages in order
             to ease the translation into other languages.  */
          if (symname == NULL || *symname == 0)
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: register relocation against non-register symbol: (unknown) in %s"),
               bfd_get_filename (input_section->owner),
               bfd_get_section_name (symsec->owner, symsec));
          else
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: register relocation against non-register symbol: %s in %s"),
               bfd_get_filename (input_section->owner), symname,
               bfd_get_section_name (symsec->owner, symsec));
@@ -1707,7 +1708,7 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section,
            && strcmp (bfd_get_section_name (symsec->owner, symsec),
                       MMIX_REG_SECTION_NAME) != 0)
        {
-         (*_bfd_error_handler)
+         _bfd_error_handler
            (_("%s: directive LOCAL valid only with a register or absolute value"),
             bfd_get_filename (input_section->owner));
 
@@ -1737,7 +1738,8 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section,
        if ((bfd_vma) srel >= first_global)
          {
            /* FIXME: Better error message.  */
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: LOCAL directive: Register $%ld is not a local register.  First global register is $%ld."),
               bfd_get_filename (input_section->owner), (long) srel, (long) first_global);
 
@@ -2194,10 +2196,12 @@ mmix_elf_add_symbol_hook (bfd *abfd,
        {
          /* How do we get the asymbol (or really: the filename) from h?
             h->u.def.section->owner is NULL.  */
-         ((*_bfd_error_handler)
-          (_("%s: Error: multiple definition of `%s'; start of %s is set in a earlier linked file\n"),
-           bfd_get_filename (abfd), *namep,
-           *namep + strlen (MMIX_LOC_SECTION_START_SYMBOL_PREFIX)));
+         _bfd_error_handler
+           /* xgettext:c-format */
+           (_("%s: Error: multiple definition of `%s'; start of %s "
+              "is set in a earlier linked file\n"),
+            bfd_get_filename (abfd), *namep,
+            *namep + strlen (MMIX_LOC_SECTION_START_SYMBOL_PREFIX));
           bfd_set_error (bfd_error_bad_value);
           return FALSE;
        }
@@ -2437,7 +2441,8 @@ _bfd_mmix_after_linker_allocation (bfd *abfd ATTRIBUTE_UNUSED,
   if (gregdata->n_remaining_bpo_relocs_this_relaxation_round
       != gregdata->n_bpo_relocs)
     {
-      (*_bfd_error_handler)
+      _bfd_error_handler
+       /* xgettext:c-format */
        (_("Internal inconsistency: remaining %u != max %u.\n\
   Please report this bug."),
         gregdata->n_remaining_bpo_relocs_this_relaxation_round,
@@ -2490,7 +2495,7 @@ bpo_reloc_request_sort_fn (const void * p1, const void * p2)
 
 void
 mmix_dump_bpo_gregs (struct bfd_link_info *link_info,
-                    bfd_error_handler_type pf)
+                    void (*pf) (const char *fmt, ...))
 {
   bfd *bpo_greg_owner;
   asection *bpo_gregs_section;