Remove syntactic sugar

[thirdparty/binutils-gdb.git] / bfd / elf32-sh.c

diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 84c5b1e5411b6d4901bf3cb0168674049a940e52..d43ac54af39eb1caeb5150b9062fd55e87f90cd1 100644 (file)
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -487,8 +487,8 @@ sh_elf_info_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
       || (r >= R_SH_FIRST_INVALID_RELOC_5 && r <= R_SH_LAST_INVALID_RELOC_5)
       || (r >= R_SH_FIRST_INVALID_RELOC_6 && r <= R_SH_LAST_INVALID_RELOC_6))
     {
-      (*_bfd_error_handler) (_("%B: unrecognised SH reloc number: %d"),
-                            abfd, r);
+      _bfd_error_handler (_("%B: unrecognised SH reloc number: %d"),
+                         abfd, r);
       bfd_set_error (bfd_error_bad_value);
       r = R_SH_NONE;
     }
@@ -575,9 +575,8 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
       laddr = irel->r_offset + 4 + irel->r_addend;
       if (laddr >= sec->size)
        {
-         (*_bfd_error_handler) (_("%B: 0x%lx: warning: bad R_SH_USES offset"),
-                                abfd,
-                                (unsigned long) irel->r_offset);
+         _bfd_error_handler (_("%B: 0x%lx: warning: bad R_SH_USES offset"),
+                             abfd, (unsigned long) irel->r_offset);
          continue;
        }
       insn = bfd_get_16 (abfd, contents + laddr);
@@ -586,9 +585,9 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
         do.  */
       if ((insn & 0xf000) != 0xd000)
        {
-         ((*_bfd_error_handler)
-          (_("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x"),
-           abfd, (unsigned long) irel->r_offset, insn));
+         _bfd_error_handler
+           (_("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x"),
+            abfd, (unsigned long) irel->r_offset, insn);
          continue;
        }
 
@@ -603,9 +602,9 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
       paddr += (laddr + 4) &~ (bfd_vma) 3;
       if (paddr >= sec->size)
        {
-         ((*_bfd_error_handler)
-          (_("%B: 0x%lx: warning: bad R_SH_USES load offset"),
-           abfd, (unsigned long) irel->r_offset));
+         _bfd_error_handler
+           (_("%B: 0x%lx: warning: bad R_SH_USES load offset"),
+            abfd, (unsigned long) irel->r_offset);
          continue;
        }
 
@@ -618,9 +617,9 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
          break;
       if (irelfn >= irelend)
        {
-         ((*_bfd_error_handler)
-          (_("%B: 0x%lx: warning: could not find expected reloc"),
-           abfd, (unsigned long) paddr));
+         _bfd_error_handler
+           (_("%B: 0x%lx: warning: could not find expected reloc"),
+            abfd, (unsigned long) paddr);
          continue;
        }
 
@@ -646,9 +645,9 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
          if (isym->st_shndx
              != (unsigned int) _bfd_elf_section_from_bfd_section (abfd, sec))
            {
-             ((*_bfd_error_handler)
-              (_("%B: 0x%lx: warning: symbol in unexpected section"),
-               abfd, (unsigned long) paddr));
+             _bfd_error_handler
+               (_("%B: 0x%lx: warning: symbol in unexpected section"),
+                abfd, (unsigned long) paddr);
              continue;
            }
 
@@ -775,9 +774,9 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
       /* Now check whether we got a COUNT reloc.  */
       if (irelcount >= irelend)
        {
-         ((*_bfd_error_handler)
-          (_("%B: 0x%lx: warning: could not find expected COUNT reloc"),
-           abfd, (unsigned long) paddr));
+         _bfd_error_handler
+           (_("%B: 0x%lx: warning: could not find expected COUNT reloc"),
+            abfd, (unsigned long) paddr);
          continue;
        }
 
@@ -785,9 +784,8 @@ sh_elf_relax_section (bfd *abfd, asection *sec,
         just deleted one.  */
       if (irelcount->r_addend == 0)
        {
-         ((*_bfd_error_handler) (_("%B: 0x%lx: warning: bad count"),
-                                 abfd,
-                                 (unsigned long) paddr));
+         _bfd_error_handler (_("%B: 0x%lx: warning: bad count"),
+                             abfd, (unsigned long) paddr);
          continue;
        }
 
@@ -1188,9 +1186,9 @@ sh_elf_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr,
 
          if (overflow)
            {
-             ((*_bfd_error_handler)
-              (_("%B: 0x%lx: fatal: reloc overflow while relaxing"),
-               abfd, (unsigned long) irel->r_offset));
+             _bfd_error_handler
+               (_("%B: 0x%lx: fatal: reloc overflow while relaxing"),
+                abfd, (unsigned long) irel->r_offset);
              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }
@@ -1558,9 +1556,9 @@ sh_elf_swap_insns (bfd *abfd, asection *sec, void *relocs,
 
          if (overflow)
            {
-             ((*_bfd_error_handler)
-              (_("%B: 0x%lx: fatal: reloc overflow while relaxing"),
-               abfd, (unsigned long) irel->r_offset));
+             _bfd_error_handler
+               (_("%B: 0x%lx: fatal: reloc overflow while relaxing"),
+                abfd, (unsigned long) irel->r_offset);
              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }
@@ -4008,7 +4006,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 
              if (howto->rightshift || howto->src_mask != 0xffffffff)
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
                    (_("%B(%A+0x%lx): %s relocation against SEC_MERGE section"),
                     input_bfd, input_section,
                     (long) rel->r_offset, howto->name);
@@ -4125,7 +4123,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                                                    rel->r_offset)
                           != (bfd_vma) -1))
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
                    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
                     input_bfd,
                     input_section,
@@ -4203,10 +4201,10 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                }
              if (disp & mask)
                {
-                 ((*_bfd_error_handler)
-                  (_("%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"),
-                   input_section->owner,
-                   (unsigned long) rel->r_offset));
+                 _bfd_error_handler
+                   (_("%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"),
+                    input_section->owner,
+                    (unsigned long) rel->r_offset);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
                }
@@ -4236,11 +4234,11 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
        case R_SH_DIR4UL:
          if (relocation & 3)
            {
-             ((*_bfd_error_handler)
-              (_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"),
-               input_section->owner,
-               (unsigned long) rel->r_offset, howto->name,
-               (unsigned long) relocation));
+             _bfd_error_handler
+               (_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"),
+                input_section->owner,
+                (unsigned long) rel->r_offset, howto->name,
+                (unsigned long) relocation);
              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }
@@ -4251,11 +4249,11 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
        case R_SH_DIR4UW:
          if (relocation & 1)
            {
-             ((*_bfd_error_handler)
-              (_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"),
-               input_section->owner,
-               (unsigned long) rel->r_offset, howto->name,
-               (unsigned long) relocation));
+             _bfd_error_handler
+               (_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"),
+                input_section->owner,
+                (unsigned long) rel->r_offset, howto->name,
+                (unsigned long) relocation);
              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }
@@ -4265,11 +4263,11 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          if ((signed int)relocation < -32
              || (signed int)relocation > 32)
            {
-             ((*_bfd_error_handler)
-              (_("%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32"),
-               input_section->owner,
-               (unsigned long) rel->r_offset,
-               (unsigned long) relocation));
+             _bfd_error_handler
+               (_("%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32"),
+                input_section->owner,
+                (unsigned long) rel->r_offset,
+                (unsigned long) relocation);
              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }
@@ -4279,11 +4277,11 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          if ((signed int)relocation < -16
              || (signed int)relocation > 16)
            {
-             ((*_bfd_error_handler)
-              (_("%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32"),
-               input_section->owner,
-               (unsigned long) rel->r_offset,
-               (unsigned long) relocation));
+             _bfd_error_handler
+               (_("%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32"),
+                input_section->owner,
+                (unsigned long) rel->r_offset,
+                (unsigned long) relocation);
              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }
@@ -4423,7 +4421,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                if (sh_elf_osec_readonly_p (output_bfd,
                                            input_section->output_section))
                  {
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
                      (_("%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"),
                       input_bfd,
                       input_section,
@@ -4901,7 +4899,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                if (sh_elf_osec_readonly_p (output_bfd,
                                            reloc_section->output_section))
                  {
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
                      (_("%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"),
                       input_bfd,
                       input_section,
@@ -6053,18 +6051,18 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                {
                  if ((old_got_type == GOT_FUNCDESC || got_type == GOT_FUNCDESC)
                      && (old_got_type == GOT_NORMAL || got_type == GOT_NORMAL))
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
                      (_("%B: `%s' accessed both as normal and FDPIC symbol"),
                       abfd, h->root.root.string);
                  else if (old_got_type == GOT_FUNCDESC
                           || got_type == GOT_FUNCDESC)
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
                      (_("%B: `%s' accessed both as FDPIC and thread local symbol"),
                       abfd, h->root.root.string);
                  else
-                   (*_bfd_error_handler)
-                   (_("%B: `%s' accessed both as normal and thread local symbol"),
-                    abfd, h->root.root.string);
+                   _bfd_error_handler
+                     (_("%B: `%s' accessed both as normal and thread local symbol"),
+                      abfd, h->root.root.string);
                  return FALSE;
                }
            }
@@ -6088,7 +6086,7 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
        case R_SH_GOTOFFFUNCDESC20:
          if (rel->r_addend)
            {
-             (*_bfd_error_handler)
+             _bfd_error_handler
                (_("%B: Function descriptor relocation with non-zero addend"),
                 abfd);
              return FALSE;
@@ -6136,11 +6134,11 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
              if (old_got_type != GOT_FUNCDESC && old_got_type != GOT_UNKNOWN)
                {
                  if (old_got_type == GOT_NORMAL)
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
                      (_("%B: `%s' accessed both as normal and FDPIC symbol"),
                       abfd, h->root.root.string);
                  else
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
                      (_("%B: `%s' accessed both as FDPIC and thread local symbol"),
                       abfd, h->root.root.string);
                }
@@ -6324,7 +6322,7 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
        case R_SH_TLS_LE_32:
          if (bfd_link_dll (info))
            {
-             (*_bfd_error_handler)
+             _bfd_error_handler
                (_("%B: TLS local exec code cannot be linked into shared objects"),
                 abfd);
              return FALSE;