gdb/doc: Clarify vCont packet description

[binutils-gdb.git] / bfd / elf32-bfin.c

diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
index 9c5802ae3328db769682ed8b351995977e2d203e..fdf02997b4b1b17fec3852935b455aae28a9f882 100644 (file)
--- a/bfd/elf32-bfin.c
+++ b/bfd/elf32-bfin.c
@@ -103,7 +103,7 @@ bfin_pcrel24_reloc (bfd *abfd,
   /* if rightshift is 1 and the number odd, return error.  */
   if (howto->rightshift && (relocation & 0x01))
     {
-      (*_bfd_error_handler) (_("relocation should be even number"));
+      _bfd_error_handler (_("relocation should be even number"));
       return bfd_reloc_overflow;
     }
 
@@ -359,7 +359,7 @@ bfin_bfd_reloc (bfd *abfd,
   /* If rightshift is 1 and the number odd, return error.  */
   if (howto->rightshift && (relocation & 0x01))
     {
-      (*_bfd_error_handler) (_("relocation should be even number"));
+      _bfd_error_handler (_("relocation should be even number"));
       return bfd_reloc_overflow;
     }
 
@@ -1598,7 +1598,8 @@ bfin_relocate_section (bfd * output_bfd,
          && _bfd_elf_section_offset (output_bfd, info, input_section,
                                      rel->r_offset) != (bfd_vma) -1)
        {
-         (*_bfd_error_handler)
+         _bfd_error_handler
+           /* xgettext:c-format */
            (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
             input_bfd,
             input_section, (long) rel->r_offset, h->root.root.string);
@@ -1628,7 +1629,8 @@ bfin_relocate_section (bfd * output_bfd,
               (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
          else
            {
-             (*_bfd_error_handler)
+             _bfd_error_handler
+               /* xgettext:c-format */
                (_("%B(%A+0x%lx): reloc against `%s': error %d"),
                 input_bfd, input_section,
                 (long) rel->r_offset, name, (int) r);
@@ -2695,6 +2697,7 @@ bfinfdpic_relocate_section (bfd * output_bfd,
        case R_BFIN_BYTE4_DATA:
          if (! IS_FDPIC (output_bfd))
            goto non_fdpic;
+         /* Fall through.  */
 
        case R_BFIN_GOT17M4:
        case R_BFIN_GOTHI:
@@ -2728,7 +2731,8 @@ bfinfdpic_relocate_section (bfd * output_bfd,
                                                       osec, sym,
                                                       rel->r_addend))
            {
-             (*_bfd_error_handler)
+             _bfd_error_handler
+               /* xgettext:c-format */
                (_("%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"),
                 input_bfd, input_section, rel->r_offset, name);
              return FALSE;
@@ -4473,7 +4477,7 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd,
          if (bfinfdpic_gotfixup_section (info)->size
              != (bfinfdpic_gotfixup_section (info)->reloc_count * 4))
            {
-             (*_bfd_error_handler)
+             _bfd_error_handler
                ("LINKER BUG: .rofixup section size mismatch");
              return FALSE;
            }
@@ -4906,7 +4910,8 @@ bfinfdpic_check_relocs (bfd *abfd, struct bfd_link_info *info,
 
        default:
        bad_reloc:
-         (*_bfd_error_handler)
+         _bfd_error_handler
+           /* xgettext:c-format */
            (_("%B: unsupported relocation type %i"),
             abfd, ELF32_R_TYPE (rel->r_info));
          return FALSE;
@@ -4966,8 +4971,9 @@ elf32_bfin_print_private_bfd_data (bfd * abfd, void * ptr)
    object file when linking.  */
 
 static bfd_boolean
-elf32_bfin_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+elf32_bfin_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 {
+  bfd *obfd = info->output_bfd;
   flagword old_flags, new_flags;
   bfd_boolean error = FALSE;
 
@@ -4980,9 +4986,10 @@ elf32_bfin_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 #ifndef DEBUG
   if (0)
 #endif
-  (*_bfd_error_handler) ("old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s, filename = %s",
-                        old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no",
-                        bfd_get_filename (ibfd));
+  _bfd_error_handler
+    ("old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s, filename = %s",
+     old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no",
+     bfd_get_filename (ibfd));
 
   if (!elf_flags_init (obfd))                  /* First call, no flags set.  */
     {
@@ -4994,11 +5001,11 @@ elf32_bfin_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
     {
       error = TRUE;
       if (IS_FDPIC (obfd))
-       (*_bfd_error_handler)
+       _bfd_error_handler
          (_("%s: cannot link non-fdpic object file into fdpic executable"),
           bfd_get_filename (ibfd));
       else
-       (*_bfd_error_handler)
+       _bfd_error_handler
          (_("%s: cannot link fdpic object file into non-fdpic executable"),
           bfd_get_filename (ibfd));
     }
@@ -5153,8 +5160,8 @@ bfin_finish_dynamic_symbol (bfd * output_bfd,
          && (info->symbolic
              || h->dynindx == -1 || h->forced_local) && h->def_regular)
        {
-         (*_bfd_error_handler) (_("*** check this relocation %s"),
-                                __FUNCTION__);
+         _bfd_error_handler (_("*** check this relocation %s"),
+                             __FUNCTION__);
          rela.r_info = ELF32_R_INFO (0, R_BFIN_PCREL24);
          rela.r_addend = bfd_get_signed_32 (output_bfd,
                                             (sgot->contents
@@ -5269,7 +5276,7 @@ bfin_adjust_dynamic_symbol (struct bfd_link_info *info,
 #else
   if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
-      (*_bfd_error_handler) (_("the bfin target does not currently support the generation of copy relocations"),
+      _bfd_error_handler (_("the bfin target does not currently support the generation of copy relocations"));
       return FALSE;
     }
 #endif