This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Remove old-style syntactic sugar
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Fri, 30 Sep 2016 17:45:24 +0930
- Subject: Remove old-style syntactic sugar
- Authentication-results: sourceware.org; auth=none
Now that _bfd_error_handler is not a function pointer.
* aout-adobe.c: Replace (*_bfd_error_handler) (...) with
_bfd_error_handler (...) throughout.
* aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c,
* cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c,
* coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c,
* coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c,
* ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c,
* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
* elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c,
* elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c,
* elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c,
* ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c,
* mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c,
* pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c,
* rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c,
* stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c,
* xcofflink.c: Likewise.
diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c
index 57fdce7..1a85401 100644
--- a/bfd/aout-adobe.c
+++ b/bfd/aout-adobe.c
@@ -121,7 +121,7 @@ aout_adobe_callback (bfd *abfd)
goto no_more_sections;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Unknown section type in a.out.adobe file: %x\n"),
abfd, ext->e_type[0]);
goto no_more_sections;
diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index 59ef6db..efed721 100644
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -196,8 +196,8 @@ MY (swap_ext_reloc_out) (bfd *abfd,
We may change this later, but assert this for the moment. */
if (r_type > 2)
{
- (*_bfd_error_handler) (_("%s: Invalid relocation type exported: %d"),
- bfd_get_filename (abfd), r_type);
+ _bfd_error_handler (_("%s: Invalid relocation type exported: %d"),
+ bfd_get_filename (abfd), r_type);
bfd_set_error (bfd_error_wrong_format);
}
@@ -239,8 +239,8 @@ MY (swap_ext_reloc_in) (bfd *abfd,
if (r_type > 2)
{
- (*_bfd_error_handler) (_("%B: Invalid relocation type imported: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: Invalid relocation type imported: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_wrong_format);
}
@@ -249,7 +249,7 @@ MY (swap_ext_reloc_in) (bfd *abfd,
if (r_extern && r_index > symcount)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Bad relocation record imported: %d"), abfd, r_index);
bfd_set_error (bfd_error_wrong_format);
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index be0126a..81658bf 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -1277,7 +1277,7 @@ NAME (aout, set_section_contents) (bfd *abfd,
(section->vma - obj_textsec (abfd)->vma);
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: can not represent section `%s' in a.out object file format"),
bfd_get_filename (abfd), bfd_get_section_name (abfd, section));
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -1577,8 +1577,9 @@ translate_to_native_sym_flags (bfd *abfd,
{
/* This case occurs, e.g., for the *DEBUG* section of a COFF
file. */
- (*_bfd_error_handler)
- (_("%s: can not represent section for symbol `%s' in a.out object file format"),
+ _bfd_error_handler
+ (_("%s: can not represent section for symbol `%s' in a.out "
+ "object file format"),
bfd_get_filename (abfd),
cache_ptr->name != NULL ? cache_ptr->name : _("*unknown*"));
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -1611,7 +1612,7 @@ translate_to_native_sym_flags (bfd *abfd,
sym_pointer->e_type[0] |= N_TEXT;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: can not represent section `%s' in a.out object file format"),
bfd_get_filename (abfd), bfd_get_section_name (abfd, sec));
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -5374,7 +5375,7 @@ NAME (aout, final_link) (bfd *abfd,
and call get_reloc_upper_bound and canonicalize_reloc to
work out the number of relocs needed, and then multiply
by the reloc size. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: relocatable link from %s to %s not supported"),
bfd_get_filename (abfd),
sub->xvec->name, abfd->xvec->name);
diff --git a/bfd/archive.c b/bfd/archive.c
index 7f94376..b932a80 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -2289,7 +2289,7 @@ _bfd_write_archive_contents (bfd *arch)
{
if (bfd_update_armap_timestamp (arch))
break;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: writing archive was slow: rewriting timestamp\n"));
}
while (++tries < 6);
@@ -2401,7 +2401,7 @@ _bfd_compute_and_write_armap (bfd *arch, unsigned int elength)
}
if (strcmp (syms[src_count]->name, "__gnu_lto_slim") == 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: plugin needed to handle lto object"),
bfd_get_filename (current));
namelen = strlen (syms[src_count]->name);
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 4130d2d..0526742 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -881,7 +881,7 @@ _bfd_default_assert_handler (const char *bfd_formatmsg,
int bfd_line)
{
- (*_bfd_error_handler) (bfd_formatmsg, bfd_version, bfd_file, bfd_line);
+ _bfd_error_handler (bfd_formatmsg, bfd_version, bfd_file, bfd_line);
}
/* Similar to _bfd_error_handler, a program can decide to exit on an
@@ -1070,14 +1070,14 @@ void
_bfd_abort (const char *file, int line, const char *fn)
{
if (fn != NULL)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("BFD %s internal error, aborting at %s:%d in %s\n"),
BFD_VERSION_STRING, file, line, fn);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("BFD %s internal error, aborting at %s:%d\n"),
BFD_VERSION_STRING, file, line);
- (*_bfd_error_handler) (_("Please report this bug.\n"));
+ _bfd_error_handler (_("Please report this bug.\n"));
_exit (EXIT_FAILURE);
}
diff --git a/bfd/binary.c b/bfd/binary.c
index d2fd293..39237d0 100644
--- a/bfd/binary.c
+++ b/bfd/binary.c
@@ -269,8 +269,9 @@ binary_set_section_contents (bfd *abfd,
have. */
if (s->filepos < 0)
- (*_bfd_error_handler)
- (_("Warning: Writing section `%s' at huge (ie negative) file offset 0x%lx."),
+ _bfd_error_handler
+ (_("Warning: Writing section `%s' at huge (ie negative) "
+ "file offset 0x%lx."),
bfd_get_section_name (abfd, s),
(unsigned long) s->filepos);
}
diff --git a/bfd/cache.c b/bfd/cache.c
index 8efbcb9..2f55717 100644
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -268,8 +268,8 @@ bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag)
else
return (FILE *) abfd->iostream;
- (*_bfd_error_handler) (_("reopening %B: %s\n"),
- orig_bfd, bfd_errmsg (bfd_get_error ()));
+ _bfd_error_handler (_("reopening %B: %s\n"),
+ orig_bfd, bfd_errmsg (bfd_get_error ()));
return NULL;
}
diff --git a/bfd/coff-alpha.c b/bfd/coff-alpha.c
index 16edc5f..36877f7 100644
--- a/bfd/coff-alpha.c
+++ b/bfd/coff-alpha.c
@@ -446,7 +446,7 @@ alpha_ecoff_bad_format_hook (bfd *abfd ATTRIBUTE_UNUSED,
return TRUE;
if (ALPHA_ECOFF_COMPRESSEDMAG (*internal_f))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Cannot handle compressed Alpha binaries.\n"
" Use compiler flags, or objZ, to generate uncompressed binaries."),
abfd);
@@ -597,7 +597,7 @@ alpha_adjust_reloc_in (bfd *abfd,
{
if (intern->r_type > ALPHA_R_GPVALUE)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unknown/unsupported relocation type %d"),
abfd, intern->r_type);
bfd_set_error (bfd_error_bad_value);
@@ -1498,21 +1498,21 @@ alpha_relocate_section (bfd *output_bfd,
switch (r_type)
{
case ALPHA_R_GPRELHIGH:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unsupported relocation: ALPHA_R_GPRELHIGH"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
continue;
case ALPHA_R_GPRELLOW:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unsupported relocation: ALPHA_R_GPRELLOW"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
continue;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unknown relocation type %d"),
input_bfd, (int) r_type);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index 34ae35c..b344d98 100644
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -1741,7 +1741,7 @@ coff_arm_relocate_section (bfd *output_bfd,
case bfd_reloc_ok:
break;
case bfd_reloc_outofrange:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad reloc address 0x%lx in section `%A'"),
input_bfd, input_section, (unsigned long) rel->r_vaddr);
return FALSE;
diff --git a/bfd/coff-h8300.c b/bfd/coff-h8300.c
index c258306..3e4722c 100644
--- a/bfd/coff-h8300.c
+++ b/bfd/coff-h8300.c
@@ -1066,7 +1066,7 @@ h8300_reloc16_extra_cases (bfd *abfd, struct bfd_link_info *link_info,
if (link_info->output_bfd->xvec != abfd->xvec)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("cannot handle R_MEM_INDIRECT reloc when using %s output"),
link_info->output_bfd->xvec->name);
diff --git a/bfd/coff-i860.c b/bfd/coff-i860.c
index 7516864..5bf5231 100644
--- a/bfd/coff-i860.c
+++ b/bfd/coff-i860.c
@@ -143,7 +143,7 @@ coff_i860_reloc_nyi (bfd *abfd ATTRIBUTE_UNUSED,
char **error_message ATTRIBUTE_UNUSED)
{
reloc_howto_type *howto = reloc_entry->howto;
- (*_bfd_error_handler) (_("relocation `%s' not yet implemented"), howto->name);
+ _bfd_error_handler (_("relocation `%s' not yet implemented"), howto->name);
return bfd_reloc_notsupported;
}
@@ -603,7 +603,7 @@ i860_reloc_processing (arelent *cache_ptr, struct internal_reloc *dst,
{
if (dst->r_symndx < 0 || dst->r_symndx >= obj_conv_table_size (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: illegal symbol index %ld in relocs"),
abfd, dst->r_symndx);
cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c
index 002c908..d3dcd9e 100644
--- a/bfd/coff-mcore.c
+++ b/bfd/coff-mcore.c
@@ -365,7 +365,7 @@ coff_mcore_relocate_section (bfd * output_bfd,
if ( input_bfd->xvec->byteorder != output_bfd->xvec->byteorder
&& output_bfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: compiled for a %s system and target is %s.\n"),
input_bfd,
bfd_big_endian (input_bfd) ? _("big endian") : _("little endian"),
diff --git a/bfd/coff-ppc.c b/bfd/coff-ppc.c
index a931f6a..6c025b0 100644
--- a/bfd/coff-ppc.c
+++ b/bfd/coff-ppc.c
@@ -844,7 +844,7 @@ ppc_record_toc_entry (bfd *abfd,
/* The size must fit in a 16-bit displacement. */
if (global_toc_size > 65535)
{
- (*_bfd_error_handler) (_("TOC overflow"));
+ _bfd_error_handler (_("TOC overflow"));
bfd_set_error (bfd_error_file_too_big);
return FALSE;
}
@@ -862,7 +862,7 @@ ppc_record_toc_entry (bfd *abfd,
/* The size must fit in a 16-bit displacement. */
if (global_toc_size >= 65535)
{
- (*_bfd_error_handler) (_("TOC overflow"));
+ _bfd_error_handler (_("TOC overflow"));
bfd_set_error (bfd_error_file_too_big);
return FALSE;
}
@@ -1037,7 +1037,7 @@ coff_ppc_relocate_section (bfd *output_bfd,
switch (r_type)
{
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unsupported relocation type 0x%02x"), input_bfd, r_type);
bfd_set_error (bfd_error_bad_value);
return FALSE;
@@ -1127,8 +1127,9 @@ coff_ppc_relocate_section (bfd *output_bfd,
/* The size must still fit in a 16-bit displacement. */
if ((bfd_vma) our_toc_offset >= 65535)
{
- (*_bfd_error_handler)
- (_("%B: Relocation for %s of %lx exceeds Toc size limit"),
+ _bfd_error_handler
+ (_("%B: Relocation for %s of %lx exceeds "
+ "Toc size limit"),
input_bfd, name,
(unsigned long) our_toc_offset);
bfd_set_error (bfd_error_bad_value);
@@ -1180,7 +1181,7 @@ coff_ppc_relocate_section (bfd *output_bfd,
if ((r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN
&& (bfd_vma) our_toc_offset > toc_section->size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Relocation exceeds allocated TOC (%lx)"),
input_bfd, (unsigned long) toc_section->size);
bfd_set_error (bfd_error_bad_value);
@@ -1234,7 +1235,7 @@ coff_ppc_relocate_section (bfd *output_bfd,
else
my_name = h->root.root.root.string;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: unsupported reloc %s <file %B, section %A>\n"
"sym %ld (%s), r_vaddr %ld (%lx)"),
input_bfd, input_section, howto->name,
@@ -1252,7 +1253,7 @@ coff_ppc_relocate_section (bfd *output_bfd,
break;
my_name = h->root.root.root.string;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Out of order IMGLUE reloc for %s"), input_bfd, my_name);
bfd_set_error (bfd_error_bad_value);
return FALSE;
@@ -1759,9 +1760,9 @@ ppc_coff_rtype2howto (arelent *relent, struct internal_reloc *internal)
howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16;
break;
default:
- (*_bfd_error_handler) (_("warning: unsupported reloc %s [%d] used -- it may not work"),
- ppc_coff_howto_table[r_type].name,
- r_type);
+ _bfd_error_handler
+ (_("warning: unsupported reloc %s [%d] used -- it may not work"),
+ ppc_coff_howto_table[r_type].name, r_type);
howto = ppc_coff_howto_table + r_type;
break;
}
@@ -1830,9 +1831,9 @@ coff_ppc_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
howto = ppc_coff_howto_table + r_type;
break;
default:
- (*_bfd_error_handler) (_("warning: unsupported reloc %s [%d] used -- it may not work"),
- ppc_coff_howto_table[r_type].name,
- r_type);
+ _bfd_error_handler
+ (_("warning: unsupported reloc %s [%d] used -- it may not work"),
+ ppc_coff_howto_table[r_type].name, r_type);
howto = ppc_coff_howto_table + r_type;
break;
}
diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
index 84860db..f3e3b18 100644
--- a/bfd/coff-rs6000.c
+++ b/bfd/coff-rs6000.c
@@ -2736,7 +2736,7 @@ xcoff_reloc_type_fail (bfd *input_bfd,
bfd_vma *relocation ATTRIBUTE_UNUSED,
bfd_byte *contents ATTRIBUTE_UNUSED)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: unsupported relocation type 0x%02x"),
bfd_get_filename (input_bfd), (unsigned int) rel->r_type);
bfd_set_error (bfd_error_bad_value);
@@ -2821,7 +2821,7 @@ xcoff_reloc_type_toc (bfd *input_bfd,
{
if (h->toc_section == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"),
bfd_get_filename (input_bfd), rel->r_vaddr,
h->root.root.string);
@@ -3567,7 +3567,7 @@ xcoff_create_csect_from_smclas (bfd *abfd,
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: symbol `%s' has unrecognized smclas %d"),
abfd, symbol_name, aux->x_csect.x_smclas);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c
index cf37ad2..e3e7fac 100644
--- a/bfd/coff-sh.c
+++ b/bfd/coff-sh.c
@@ -501,7 +501,7 @@ sh_coff_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
if (sh_reloc_map[i].bfd_reloc_val == code)
return &sh_coff_howtos[(int) sh_reloc_map[i].shcoff_reloc_val];
- (*_bfd_error_handler) (_("SH Error: unknown reloc type %d"), code);
+ _bfd_error_handler (_("SH Error: unknown reloc type %d"), code);
return NULL;
}
@@ -771,8 +771,8 @@ sh_relax_section (bfd *abfd,
laddr += ((irel->r_offset & 0xffffffff) ^ 0x80000000) - 0x80000000;
if (laddr >= sec->size)
{
- (*_bfd_error_handler) ("%B: 0x%lx: warning: bad R_SH_USES offset",
- abfd, (unsigned long) irel->r_vaddr);
+ _bfd_error_handler ("%B: 0x%lx: warning: bad R_SH_USES offset",
+ abfd, (unsigned long) irel->r_vaddr);
continue;
}
insn = bfd_get_16 (abfd, contents + laddr);
@@ -780,9 +780,9 @@ sh_relax_section (bfd *abfd,
/* If the instruction is not mov.l NN,rN, we don't know what to 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_vaddr, insn));
+ _bfd_error_handler
+ ("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x",
+ abfd, (unsigned long) irel->r_vaddr, insn);
continue;
}
@@ -797,9 +797,9 @@ sh_relax_section (bfd *abfd,
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_vaddr));
+ _bfd_error_handler
+ ("%B: 0x%lx: warning: bad R_SH_USES load offset",
+ abfd, (unsigned long) irel->r_vaddr);
continue;
}
@@ -821,9 +821,9 @@ sh_relax_section (bfd *abfd,
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;
}
@@ -837,9 +837,9 @@ sh_relax_section (bfd *abfd,
&sym);
if (sym.n_scnum != 0 && sym.n_scnum != sec->target_index)
{
- ((*_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;
}
@@ -962,9 +962,9 @@ sh_relax_section (bfd *abfd,
/* 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;
}
@@ -972,8 +972,8 @@ sh_relax_section (bfd *abfd,
just deleted one. */
if (irelcount->r_offset == 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;
}
@@ -1342,9 +1342,9 @@ sh_relax_delete_bytes (bfd *abfd,
if (overflow)
{
- ((*_bfd_error_handler)
- ("%B: 0x%lx: fatal: reloc overflow while relaxing",
- abfd, (unsigned long) irel->r_vaddr));
+ _bfd_error_handler
+ ("%B: 0x%lx: fatal: reloc overflow while relaxing",
+ abfd, (unsigned long) irel->r_vaddr);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -1437,8 +1437,8 @@ sh_relax_delete_bytes (bfd *abfd,
if (obj_symbols (abfd) != NULL
|| obj_raw_syments (abfd) != NULL)
{
- ((*_bfd_error_handler)
- ("%B: fatal: generic symbols retrieved before relaxing", abfd));
+ _bfd_error_handler
+ ("%B: fatal: generic symbols retrieved before relaxing", abfd);
bfd_set_error (bfd_error_invalid_operation);
return FALSE;
}
@@ -2629,9 +2629,9 @@ sh_swap_insns (bfd * abfd,
if (overflow)
{
- ((*_bfd_error_handler)
- ("%B: 0x%lx: fatal: reloc overflow while relaxing",
- abfd, (unsigned long) irel->r_vaddr));
+ _bfd_error_handler
+ ("%B: 0x%lx: fatal: reloc overflow while relaxing",
+ abfd, (unsigned long) irel->r_vaddr);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -2766,7 +2766,7 @@ sh_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
if (symndx < 0
|| (unsigned long) symndx >= obj_raw_syment_count (input_bfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: illegal symbol index %ld in relocs",
input_bfd, symndx);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/coff-tic4x.c b/bfd/coff-tic4x.c
index 9b30f7c..4f86b5e 100644
--- a/bfd/coff-tic4x.c
+++ b/bfd/coff-tic4x.c
@@ -180,8 +180,8 @@ tic4x_lookup_howto (arelent *internal,
}
}
- (*_bfd_error_handler) (_("Unrecognized reloc type 0x%x"),
- (unsigned int) dst->r_type);
+ _bfd_error_handler (_("Unrecognized reloc type 0x%x"),
+ (unsigned int) dst->r_type);
abort();
}
@@ -222,7 +222,7 @@ tic4x_reloc_processing (arelent *relent,
{
if (reloc->r_symndx < 0 || reloc->r_symndx >= obj_conv_table_size (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: illegal symbol index %ld in relocs"),
bfd_get_filename (abfd), reloc->r_symndx);
relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
diff --git a/bfd/coff-tic54x.c b/bfd/coff-tic54x.c
index e44cc62..d8a443a 100644
--- a/bfd/coff-tic54x.c
+++ b/bfd/coff-tic54x.c
@@ -275,8 +275,8 @@ tic54x_lookup_howto (arelent *internal,
}
}
- (*_bfd_error_handler) (_("Unrecognized reloc type 0x%x"),
- (unsigned int) dst->r_type);
+ _bfd_error_handler (_("Unrecognized reloc type 0x%x"),
+ (unsigned int) dst->r_type);
abort ();
}
@@ -360,7 +360,7 @@ tic54x_reloc_processing (arelent *relent,
{
if (reloc->r_symndx < 0 || reloc->r_symndx >= obj_conv_table_size (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: illegal symbol index %ld in relocs"),
abfd, reloc->r_symndx);
relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
diff --git a/bfd/coff-tic80.c b/bfd/coff-tic80.c
index 99808f1..912faca 100644
--- a/bfd/coff-tic80.c
+++ b/bfd/coff-tic80.c
@@ -436,8 +436,8 @@ rtype2howto (arelent *cache_ptr, struct internal_reloc *dst)
}
}
- (*_bfd_error_handler) (_("Unrecognized reloc type 0x%x"),
- (unsigned int) dst->r_type);
+ _bfd_error_handler (_("Unrecognized reloc type 0x%x"),
+ (unsigned int) dst->r_type);
cache_ptr->howto = tic80_howto_table + 0;
}
@@ -665,7 +665,7 @@ coff_tic80_relocate_section (bfd *output_bfd,
case bfd_reloc_ok:
break;
case bfd_reloc_outofrange:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad reloc address 0x%lx in section `%A'"),
input_bfd, input_section, (unsigned long) rel->r_vaddr);
return FALSE;
diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c
index f2a3c16..a759283 100644
--- a/bfd/coff64-rs6000.c
+++ b/bfd/coff64-rs6000.c
@@ -2105,7 +2105,7 @@ xcoff64_create_csect_from_smclas (bfd *abfd, union internal_auxent *aux,
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: symbol `%s' has unrecognized smclas %d"),
abfd, symbol_name, aux->x_csect.x_smclas);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index eef3fa8..20829fc 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -1302,7 +1302,7 @@ styp_to_sec_flags (bfd *abfd,
/* If the section flag was not handled, report it here. */
if (unhandled != NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B (%s): Section flag %s (0x%x) ignored"),
abfd, name, unhandled, flag);
result = FALSE;
@@ -1937,7 +1937,7 @@ coff_set_alignment_hook (bfd * abfd ATTRIBUTE_UNUSED,
section->rel_filepos += relsz;
}
else if (hdr->s_nreloc == 0xffff)
- (*_bfd_error_handler)
+ _bfd_error_handler
("%s: warning: claims to have 0xffff relocs, without overflow",
bfd_get_filename (abfd));
}
@@ -2453,7 +2453,7 @@ coff_set_arch_mach_hook (bfd *abfd, void * filehdr)
#endif
default:
arch = bfd_arch_obscure;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Unrecognized TI COFF target id '0x%x'"),
internal_f->f_target_id);
break;
@@ -3179,7 +3179,7 @@ coff_compute_section_file_positions (bfd * abfd)
if (page_size < 0)
{
bfd_set_error (bfd_error_file_too_big);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: page size is too large (0x%x)"), abfd, page_size);
return FALSE;
}
@@ -3338,7 +3338,7 @@ coff_compute_section_file_positions (bfd * abfd)
if (target_index >= bfd_coff_max_nscns (abfd))
{
bfd_set_error (bfd_error_file_too_big);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: too many sections (%d)"), abfd, target_index);
return FALSE;
}
@@ -3756,7 +3756,7 @@ coff_write_object_contents (bfd * abfd)
if (string_size >= 10000000)
{
bfd_set_error (bfd_error_file_too_big);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: section %s: string table overflow at offset %ld"),
abfd, current->name, string_size);
return FALSE;
@@ -4573,7 +4573,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect)
native_lineno = (LINENO *) buy_and_read (abfd, asect->line_filepos, amt);
if (native_lineno == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: line number table read failed"), abfd);
bfd_release (abfd, lineno_cache);
return FALSE;
@@ -4606,7 +4606,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect)
symndx = dst.l_addr.l_symndx;
if (symndx >= obj_raw_syment_count (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: illegal symbol index 0x%lx in line number entry %d"),
abfd, (long) symndx, counter);
cache_ptr->line_number = -1;
@@ -4619,7 +4619,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect)
pointers like this. */
if (! ent->is_sym)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: illegal symbol index 0x%lx in line number entry %d"),
abfd, (long) symndx, counter);
cache_ptr->line_number = -1;
@@ -4632,7 +4632,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect)
if (sym < obj_symbols (abfd)
|| sym >= obj_symbols (abfd) + bfd_get_symcount (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: illegal symbol in line number entry %d"),
abfd, counter);
cache_ptr->line_number = -1;
@@ -4644,7 +4644,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect)
nbr_func++;
cache_ptr->u.sym = (asymbol *) sym;
if (sym->lineno != NULL)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: duplicate line number information for `%s'"),
abfd, bfd_asymbol_name (&sym->symbol));
@@ -5056,7 +5056,7 @@ coff_slurp_symbol_table (bfd * abfd)
case C_UEXT: /* Tentative external definition. */
#endif
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Unrecognized storage class %d for %s symbol `%s'"),
abfd, src->u.syment.n_sclass,
dst->symbol.section->name, dst->symbol.name);
@@ -5186,7 +5186,7 @@ coff_classify_symbol (bfd *abfd,
{
char buf[SYMNMLEN + 1];
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("warning: %B: local symbol `%s' has no section"),
abfd, _bfd_coff_internal_syment_name (abfd, syment, buf));
}
@@ -5292,7 +5292,7 @@ coff_slurp_reloc_table (bfd * abfd, sec_ptr asect, asymbol ** symbols)
{
if (dst.r_symndx < 0 || dst.r_symndx >= obj_conv_table_size (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: illegal symbol index %ld in relocs"),
abfd, (long) dst.r_symndx);
cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
@@ -5331,7 +5331,7 @@ coff_slurp_reloc_table (bfd * abfd, sec_ptr asect, asymbol ** symbols)
if (cache_ptr->howto == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: illegal relocation type %d at address 0x%lx"),
abfd, dst.r_type, (long) dst.r_vaddr);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index b9b8860..216102e 100644
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -173,7 +173,7 @@ make_a_section_from_file (bfd *abfd,
case compress:
if (!bfd_init_section_compress_status (abfd, return_section))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unable to initialize compress status for section %s"),
abfd, name);
return FALSE;
@@ -196,7 +196,7 @@ make_a_section_from_file (bfd *abfd,
case decompress:
if (!bfd_init_section_decompress_status (abfd, return_section))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unable to initialize decompress status for section %s"),
abfd, name);
return FALSE;
@@ -1704,7 +1704,7 @@ _bfd_coff_read_string_table (bfd *abfd)
if (strsize < STRING_SIZE_SIZE)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad string table size %lu"), abfd, (unsigned long) strsize);
bfd_set_error (bfd_error_bad_value);
return NULL;
@@ -3029,7 +3029,7 @@ bfd_coff_gc_sections (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *info)
if (!bed->can_gc_sections
|| !is_coff_hash_table (info->hash))
{
- (*_bfd_error_handler)(_("Warning: gc-sections option ignored"));
+ _bfd_error_handler(_("Warning: gc-sections option ignored"));
return TRUE;
}
#endif
diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index 0f6ef59..52ad84e 100644
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
@@ -344,7 +344,7 @@ coff_link_add_symbols (bfd *abfd,
& COFF_LINK_HASH_PE_SECTION_SYMBOL) == 0
&& (*sym_hash)->root.type != bfd_link_hash_undefined
&& (*sym_hash)->root.type != bfd_link_hash_undefweak)
- (*_bfd_error_handler)
+ _bfd_error_handler
("Warning: symbol `%s' is both section and non-section",
name);
@@ -445,7 +445,7 @@ coff_link_add_symbols (bfd *abfd,
&& !(DTYPE ((*sym_hash)->type) == DTYPE (sym.n_type)
&& (BTYPE ((*sym_hash)->type) == T_NULL
|| BTYPE (sym.n_type) == T_NULL)))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: type of symbol `%s' changed from %d to %d in %B"),
abfd, name, (*sym_hash)->type, sym.n_type);
@@ -2362,7 +2362,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd)
if ((o->flags & SEC_RELOC) != 0
&& o->reloc_count != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocs in section `%A', but it has no contents"),
input_bfd, o);
bfd_set_error (bfd_error_no_contents);
@@ -2721,7 +2721,7 @@ _bfd_coff_write_global_sym (struct bfd_hash_entry *bh, void *data)
if (sec->reloc_count > 0xffff
&& (! obj_pe (output_bfd)
|| bfd_link_relocatable (flaginfo->info)))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: %s: reloc overflow: 0x%lx > 0xffff"),
bfd_get_filename (output_bfd),
bfd_get_section_name (output_bfd, sec),
@@ -2730,7 +2730,7 @@ _bfd_coff_write_global_sym (struct bfd_hash_entry *bh, void *data)
if (sec->lineno_count > 0xffff
&& (! obj_pe (output_bfd)
|| bfd_link_relocatable (flaginfo->info)))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: %s: line number overflow: 0x%lx > 0xffff"),
bfd_get_filename (output_bfd),
bfd_get_section_name (output_bfd, sec),
@@ -2954,7 +2954,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
else if (symndx < 0
|| (unsigned long) symndx >= obj_raw_syment_count (input_bfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: illegal symbol index %ld in relocs", input_bfd, symndx);
return FALSE;
}
@@ -3115,7 +3115,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
case bfd_reloc_ok:
break;
case bfd_reloc_outofrange:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad reloc address 0x%lx in section `%A'"),
input_bfd, input_section, (unsigned long) rel->r_vaddr);
return FALSE;
diff --git a/bfd/coffswap.h b/bfd/coffswap.h
index e6c8c3f..018e772 100644
--- a/bfd/coffswap.h
+++ b/bfd/coffswap.h
@@ -806,7 +806,7 @@ coff_swap_scnhdr_out (bfd * abfd, void * in, void * out)
memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
buf[sizeof (scnhdr_int->s_name)] = '\0';
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: %s: line number overflow: 0x%lx > 0xffff"),
bfd_get_filename (abfd),
buf, scnhdr_int->s_nlnno);
@@ -821,9 +821,9 @@ coff_swap_scnhdr_out (bfd * abfd, void * in, void * out)
memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
buf[sizeof (scnhdr_int->s_name)] = '\0';
- (*_bfd_error_handler) (_("%s: %s: reloc overflow: 0x%lx > 0xffff"),
- bfd_get_filename (abfd),
- buf, scnhdr_int->s_nreloc);
+ _bfd_error_handler (_("%s: %s: reloc overflow: 0x%lx > 0xffff"),
+ bfd_get_filename (abfd),
+ buf, scnhdr_int->s_nreloc);
bfd_set_error (bfd_error_file_truncated);
PUT_SCNHDR_NRELOC (abfd, 0xffff, scnhdr_ext->s_nreloc);
ret = 0;
diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c
index 3e1622c..2eb99e1 100644
--- a/bfd/cpu-arm.c
+++ b/bfd/cpu-arm.c
@@ -331,7 +331,7 @@ bfd_arm_update_notes (bfd *abfd, const char *note_section)
if (! bfd_set_section_contents (abfd, arm_arch_section, buffer,
(file_ptr) 0, buffer_size))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("warning: unable to update contents of %s section in %s"),
note_section, bfd_get_filename (abfd));
goto FAIL;
diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
index 818bc1d..f6373d8 100644
--- a/bfd/cpu-m68k.c
+++ b/bfd/cpu-m68k.c
@@ -259,7 +259,7 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
if (!cpu32_fido_mix_warning)
{
cpu32_fido_mix_warning = 1;
- (*_bfd_error_handler) ("warning: linking CPU32 objects with fido objects");
+ _bfd_error_handler ("warning: linking CPU32 objects with fido objects");
}
return bfd_lookup_arch (a->arch,
bfd_m68k_features_to_mach (fido_a | m68881));
diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c
index aaa117b..9b14173 100644
--- a/bfd/cpu-sh.c
+++ b/bfd/cpu-sh.c
@@ -520,7 +520,7 @@ sh_merge_bfd_arch (bfd *ibfd, bfd *obfd)
if (!SH_VALID_CO_ARCH_SET (merged_arch))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: uses %s instructions while previous modules use %s instructions",
ibfd,
SH_ARCH_SET_HAS_DSP (new_arch) ? "dsp" : "floating point",
@@ -530,7 +530,7 @@ sh_merge_bfd_arch (bfd *ibfd, bfd *obfd)
}
else if (!SH_VALID_ARCH_SET (merged_arch))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("internal error: merge of architecture '%s' with architecture '%s' produced unknown architecture\n",
bfd_printable_name (obfd),
bfd_printable_name (ibfd));
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 33370ac..51f3de1 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -517,8 +517,8 @@ read_section (bfd * abfd,
}
if (! msec)
{
- (*_bfd_error_handler) (_("Dwarf Error: Can't find %s section."),
- sec->uncompressed_name);
+ _bfd_error_handler (_("Dwarf Error: Can't find %s section."),
+ sec->uncompressed_name);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -546,9 +546,9 @@ read_section (bfd * abfd,
that the client wants. Validate it here to avoid trouble later. */
if (offset != 0 && offset >= *section_size)
{
- (*_bfd_error_handler) (_("Dwarf Error: Offset (%lu)"
- " greater than or equal to %s size (%lu)."),
- (long) offset, section_name, *section_size);
+ _bfd_error_handler (_("Dwarf Error: Offset (%lu)"
+ " greater than or equal to %s size (%lu)."),
+ (long) offset, section_name, *section_size);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -1005,7 +1005,7 @@ read_attribute_value (struct attribute * attr,
if (info_ptr >= info_ptr_end && form != DW_FORM_flag_present)
{
- (*_bfd_error_handler) (_("Dwarf Error: Info pointer extends beyond end of attributes"));
+ _bfd_error_handler (_("Dwarf Error: Info pointer extends beyond end of attributes"));
bfd_set_error (bfd_error_bad_value);
return info_ptr;
}
@@ -1157,8 +1157,8 @@ read_attribute_value (struct attribute * attr,
info_ptr = read_attribute_value (attr, form, unit, info_ptr, info_ptr_end);
break;
default:
- (*_bfd_error_handler) (_("Dwarf Error: Invalid or unhandled FORM value: %#x."),
- form);
+ _bfd_error_handler (_("Dwarf Error: Invalid or unhandled FORM value: %#x."),
+ form);
bfd_set_error (bfd_error_bad_value);
return NULL;
}
@@ -1446,7 +1446,7 @@ concat_filename (struct line_info_table *table, unsigned int file)
{
/* FILE == 0 means unknown. */
if (file)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: mangled line number section (bad file number)."));
return strdup ("<unknown>");
}
@@ -1687,7 +1687,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
if (stash->dwarf_line_size < 16)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: Line info section is too small (%ld)"),
(long) stash->dwarf_line_size);
bfd_set_error (bfd_error_bad_value);
@@ -1716,7 +1716,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
if (lh.total_length > stash->dwarf_line_size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: Line info data is bigger (0x%lx) than the section (0x%lx)"),
(long) lh.total_length, (long) stash->dwarf_line_size);
bfd_set_error (bfd_error_bad_value);
@@ -1728,7 +1728,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
lh.version = read_2_bytes (abfd, line_ptr, line_end);
if (lh.version < 2 || lh.version > 4)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: Unhandled .debug_line version %d."), lh.version);
bfd_set_error (bfd_error_bad_value);
return NULL;
@@ -1737,7 +1737,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
if (line_ptr + offset_size + (lh.version >=4 ? 6 : 5) >= line_end)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: Ran out of room reading prologue"));
bfd_set_error (bfd_error_bad_value);
return NULL;
@@ -1762,7 +1762,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
if (lh.maximum_ops_per_insn == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: Invalid maximum operations per instruction."));
bfd_set_error (bfd_error_bad_value);
return NULL;
@@ -1782,7 +1782,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
if (line_ptr + (lh.opcode_base - 1) >= line_end)
{
- (*_bfd_error_handler) (_("Dwarf Error: Ran out of room reading opcodes"));
+ _bfd_error_handler (_("Dwarf Error: Ran out of room reading opcodes"));
bfd_set_error (bfd_error_bad_value);
return NULL;
}
@@ -1969,7 +1969,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
line_ptr += exop_len - 1;
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: mangled line number section."));
bfd_set_error (bfd_error_bad_value);
line_fail:
@@ -2326,7 +2326,7 @@ find_abstract_instance_name (struct comp_unit *unit,
info_ptr = read_alt_indirect_ref (unit, die_ref);
if (info_ptr == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: Unable to read alt ref %u."), die_ref);
bfd_set_error (bfd_error_bad_value);
return NULL;
@@ -2350,7 +2350,7 @@ find_abstract_instance_name (struct comp_unit *unit,
abbrev = lookup_abbrev (abbrev_number, unit->abbrevs);
if (! abbrev)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: Could not find abbrev number %u."), abbrev_number);
bfd_set_error (bfd_error_bad_value);
}
@@ -2494,7 +2494,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
abbrev = lookup_abbrev (abbrev_number,unit->abbrevs);
if (! abbrev)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: Could not find abbrev number %u."),
abbrev_number);
bfd_set_error (bfd_error_bad_value);
@@ -2763,7 +2763,7 @@ parse_comp_unit (struct dwarf2_debug *stash,
an error, just return a NULL. */
if (version)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: found dwarf version '%u', this reader"
" only handles version 2, 3 and 4 information."), version);
bfd_set_error (bfd_error_bad_value);
@@ -2773,7 +2773,7 @@ parse_comp_unit (struct dwarf2_debug *stash,
if (addr_size > sizeof (bfd_vma))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: found address size '%u', this reader"
" can not handle sizes greater than '%u'."),
addr_size,
@@ -2784,7 +2784,7 @@ parse_comp_unit (struct dwarf2_debug *stash,
if (addr_size != 2 && addr_size != 4 && addr_size != 8)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("Dwarf Error: found address size '%u', this reader"
" can only handle address sizes '2', '4' and '8'.", addr_size);
bfd_set_error (bfd_error_bad_value);
@@ -2810,8 +2810,8 @@ parse_comp_unit (struct dwarf2_debug *stash,
abbrev = lookup_abbrev (abbrev_number, abbrevs);
if (! abbrev)
{
- (*_bfd_error_handler) (_("Dwarf Error: Could not find abbrev number %u."),
- abbrev_number);
+ _bfd_error_handler (_("Dwarf Error: Could not find abbrev number %u."),
+ abbrev_number);
bfd_set_error (bfd_error_bad_value);
return NULL;
}
@@ -2875,7 +2875,7 @@ parse_comp_unit (struct dwarf2_debug *stash,
/* PR 17512: file: 1fe726be. */
if (! is_str_attr (attr.form))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Dwarf Error: DW_AT_comp_dir attribute encountered with a non-string form."));
comp_dir = NULL;
}
diff --git a/bfd/ecoff.c b/bfd/ecoff.c
index 4515172..6b46ab7 100644
--- a/bfd/ecoff.c
+++ b/bfd/ecoff.c
@@ -959,7 +959,7 @@ _bfd_ecoff_slurp_symbol_table (bfd *abfd)
if (internal_ptr - internal < (ptrdiff_t) bfd_get_symcount (abfd))
{
bfd_get_symcount (abfd) = internal_ptr - internal;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: isymMax (%ld) is greater than ifdMax (%d)\n"),
abfd, ecoff_data (abfd)->debug_info.symbolic_header.isymMax,
ecoff_data (abfd)->debug_info.symbolic_header.ifdMax);
diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
index e787ee9..02152fe 100644
--- a/bfd/elf-eh-frame.c
+++ b/bfd/elf-eh-frame.c
@@ -1673,7 +1673,7 @@ _bfd_elf_write_section_eh_frame_entry (bfd *abfd, struct bfd_link_info *info,
addr = bfd_get_signed_32 (abfd, contents + offset) + offset;
if (addr <= last_addr)
{
- (*_bfd_error_handler) (_("%B: %s not in order"), sec->owner, sec->name);
+ _bfd_error_handler (_("%B: %s not in order"), sec->owner, sec->name);
return FALSE;
}
@@ -1686,15 +1686,15 @@ _bfd_elf_write_section_eh_frame_entry (bfd *abfd, struct bfd_link_info *info,
addr -= (sec->output_section->vma + sec->output_offset + sec->rawsize);
if (addr & 1)
{
- (*_bfd_error_handler) (_("%B: %s invalid input section size"),
- sec->owner, sec->name);
+ _bfd_error_handler (_("%B: %s invalid input section size"),
+ sec->owner, sec->name);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
if (last_addr >= addr + sec->rawsize)
{
- (*_bfd_error_handler) (_("%B: %s points past end of text section"),
- sec->owner, sec->name);
+ _bfd_error_handler (_("%B: %s points past end of text section"),
+ sec->owner, sec->name);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -2123,7 +2123,7 @@ _bfd_elf_fixup_eh_frame_hdr (struct bfd_link_info *info)
sec = hdr_info->u.compact.entries[i];
if (sec->output_section != osec)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Invalid output section for .eh_frame_entry: %s"),
sec->output_section->name);
return FALSE;
@@ -2146,7 +2146,7 @@ _bfd_elf_fixup_eh_frame_hdr (struct bfd_link_info *info)
if (i != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Invalid contents in %s section"), osec->name);
return FALSE;
}
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index 4b1ca58..9b44c0a 100644
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -808,8 +808,8 @@ mn10300_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
r_type = ELF32_R_TYPE (dst->r_info);
if (r_type >= R_MN10300_MAX)
{
- (*_bfd_error_handler) (_("%B: unrecognised MN10300 reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised MN10300 reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_MN10300_NONE;
}
@@ -1022,7 +1022,7 @@ mn10300_do_tls_transition (bfd * input_bfd,
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: Unsupported transition from %s to %s"),
bfd_get_filename (input_bfd),
elf_mn10300_howto_table[r_type].name,
@@ -1214,7 +1214,7 @@ mn10300_elf_check_relocs (bfd *abfd,
/* Transition GD->IE. */
tls_type = GOT_TLS_IE;
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: %s' accessed both as normal and thread local symbol"),
abfd, h ? h->root.root.string : "<local>");
}
@@ -2109,7 +2109,7 @@ mn10300_elf_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
(_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
input_bfd,
input_section,
diff --git a/bfd/elf.c b/bfd/elf.c
index 7d0b8a9..c096191 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -350,7 +350,7 @@ bfd_elf_string_from_elf_section (bfd *abfd,
if (strindex >= hdr->sh_size)
{
unsigned int shstrndx = elf_elfheader(abfd)->e_shstrndx;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: invalid string offset %u >= %lu for section `%s'"),
abfd, strindex, (unsigned long) hdr->sh_size,
(shindex == shstrndx && strindex == hdr->sh_name
@@ -489,9 +489,9 @@ bfd_elf_get_elf_syms (bfd *ibfd,
if (!(*bed->s->swap_symbol_in) (ibfd, esym, shndx, isym))
{
symoffset += (esym - (bfd_byte *) extsym_buf) / extsym_size;
- (*_bfd_error_handler) (_("%B symbol number %lu references "
- "nonexistent SHT_SYMTAB_SHNDX section"),
- ibfd, (unsigned long) symoffset);
+ _bfd_error_handler (_("%B symbol number %lu references "
+ "nonexistent SHT_SYMTAB_SHNDX section"),
+ ibfd, (unsigned long) symoffset);
if (alloc_intsym != NULL)
free (alloc_intsym);
intsym_buf = NULL;
@@ -691,8 +691,8 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
}
if (idx >= shnum)
{
- ((*_bfd_error_handler)
- (_("%B: invalid SHT_GROUP entry"), abfd));
+ _bfd_error_handler
+ (_("%B: invalid SHT_GROUP entry"), abfd);
idx = 0;
}
dest->shdr = elf_elfsections (abfd)[idx];
@@ -710,7 +710,8 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
{
elf_tdata (abfd)->group_sect_ptr = NULL;
elf_tdata (abfd)->num_group = num_group = -1;
- (*_bfd_error_handler) (_("%B: no valid group sections found"), abfd);
+ _bfd_error_handler
+ (_("%B: no valid group sections found"), abfd);
bfd_set_error (bfd_error_bad_value);
}
}
@@ -777,8 +778,8 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
if (elf_group_name (newsect) == NULL)
{
- (*_bfd_error_handler) (_("%B: no group info for section %A"),
- abfd, newsect);
+ _bfd_error_handler (_("%B: no group info for section %A"),
+ abfd, newsect);
return FALSE;
}
return TRUE;
@@ -825,7 +826,7 @@ _bfd_elf_setup_sections (bfd *abfd)
sh_link. We don't want to proceed. */
if (linksec == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: sh_link [%d] in section `%A' is incorrect"),
s->owner, s, elfsec);
result = FALSE;
@@ -837,7 +838,7 @@ _bfd_elf_setup_sections (bfd *abfd)
else if (this_hdr->sh_type == SHT_GROUP
&& elf_next_in_group (s) == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: SHT_GROUP section [index %d] has no SHF_GROUP sections"),
abfd, elf_section_data (s)->this_idx);
result = FALSE;
@@ -857,7 +858,7 @@ _bfd_elf_setup_sections (bfd *abfd)
/* PR binutils/18758: Beware of corrupt binaries with invalid group data. */
if (shdr == NULL || shdr->bfd_section == NULL || shdr->contents == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: section group entry number %u is corrupt"),
abfd, i);
result = FALSE;
@@ -881,7 +882,7 @@ _bfd_elf_setup_sections (bfd *abfd)
else
{
/* There are some unknown sections in the group. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unknown [%d] section `%s' in group [%s]"),
abfd,
(unsigned int) idx->shdr->sh_type,
@@ -1147,7 +1148,7 @@ _bfd_elf_make_section_from_shdr (bfd *abfd,
{
if (!bfd_init_section_compress_status (abfd, newsect))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unable to initialize compress status for section %s"),
abfd, name);
return FALSE;
@@ -1157,7 +1158,7 @@ _bfd_elf_make_section_from_shdr (bfd *abfd,
{
if (!bfd_init_section_decompress_status (abfd, newsect))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unable to initialize decompress status for section %s"),
abfd, name);
return FALSE;
@@ -1944,7 +1945,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
}
if (sections_being_created [shindex])
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: loop in section dependencies detected"), abfd);
return FALSE;
}
@@ -2051,7 +2052,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
Unusual, but possible. Warn, but continue. */
if (elf_onesymtab (abfd) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: multiple symbol tables detected - ignoring the table in section %u"),
abfd, shindex);
goto success;
@@ -2133,7 +2134,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
Unusual, but possible. Warn, but continue. */
if (elf_dynsymtab (abfd) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: multiple dynamic symbol tables detected - ignoring the table in section %u"),
abfd, shindex);
goto success;
@@ -2244,9 +2245,9 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
/* Check for a bogus link to avoid crashing. */
if (hdr->sh_link >= num_sec)
{
- ((*_bfd_error_handler)
- (_("%B: invalid link %lu for reloc section %s (index %u)"),
- abfd, hdr->sh_link, name, shindex));
+ _bfd_error_handler
+ (_("%B: invalid link %lu for reloc section %s (index %u)"),
+ abfd, hdr->sh_link, name, shindex);
ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name,
shindex);
goto success;
@@ -2429,7 +2430,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
if ((hdr->sh_flags & SHF_ALLOC) != 0)
/* FIXME: How to properly handle allocated section reserved
for applications? */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: don't know how to handle allocated, application "
"specific section `%s' [0x%8x]"),
abfd, name, hdr->sh_type);
@@ -2444,7 +2445,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
else if (hdr->sh_type >= SHT_LOPROC
&& hdr->sh_type <= SHT_HIPROC)
/* FIXME: We should handle this section. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: don't know how to handle processor specific section "
"`%s' [0x%8x]"),
abfd, name, hdr->sh_type);
@@ -2455,7 +2456,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
/* SHF_OS_NONCONFORMING indicates that special knowledge is
required to correctly process the section and the file should
be rejected with an error message. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: don't know how to handle OS specific section "
"`%s' [0x%8x]"),
abfd, name, hdr->sh_type);
@@ -2468,7 +2469,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
}
else
/* FIXME: We should handle this section. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: don't know how to handle section `%s' [0x%8x]"),
abfd, name, hdr->sh_type);
@@ -3171,7 +3172,7 @@ elf_fake_sections (bfd *abfd, asection *asect, void *fsarg)
/* PR 17512: file: 0eb809fe, 8b0535ee. */
if (asect->alignment_power >= (sizeof (bfd_vma) * 8) - 1)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: error: Alignment power %d of section `%A' is too big"),
abfd, asect, asect->alignment_power);
arg->failed = TRUE;
@@ -3201,7 +3202,7 @@ elf_fake_sections (bfd *abfd, asection *asect, void *fsarg)
allow the link to proceed. This can happen when users link
non-bss input sections to bss output sections, or emit data
to a bss output section via a linker script. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("warning: section `%A' type changed to PROGBITS"), asect);
this_hdr->sh_type = sh_type;
}
@@ -3726,7 +3727,7 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info)
if (discarded_section (s))
{
asection *kept;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: sh_link of section `%A' points to discarded section `%A' of `%B'"),
abfd, d->this_hdr.bfd_section,
s, s->owner);
@@ -3749,7 +3750,7 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info)
/* Handle objcopy. */
if (s->output_section == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: sh_link of section `%A' points to removed section `%A' of `%B'"),
abfd, d->this_hdr.bfd_section, s, s->owner);
bfd_set_error (bfd_error_bad_value);
@@ -5291,7 +5292,7 @@ assign_file_positions_for_load_sections (bfd *abfd,
|| (!m->p_paddr_valid
&& p->p_paddr < (bfd_vma) off))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Not enough room for program headers, try linking with -N"),
abfd);
bfd_set_error (bfd_error_bad_value);
@@ -5377,7 +5378,7 @@ assign_file_positions_for_load_sections (bfd *abfd,
&& (s_start < p_end
|| p_end < p_start))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: section %A lma %#lx adjusted to %#lx"), abfd, sec,
(unsigned long) s_start, (unsigned long) p_end);
adjust = 0;
@@ -5513,7 +5514,7 @@ assign_file_positions_for_load_sections (bfd *abfd,
if (!ELF_SECTION_IN_SEGMENT_1 (this_hdr, p, check_vma, 0)
&& !ELF_TBSS_SPECIAL (this_hdr, p))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: section `%A' can't be allocated in segment %d"),
abfd, sec, j);
print_segment_map (m);
@@ -5560,7 +5561,7 @@ assign_file_positions_for_non_load_sections (bfd *abfd,
else if ((hdr->sh_flags & SHF_ALLOC) != 0)
{
if (hdr->sh_size != 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: allocated section `%s' not in segment"),
abfd,
(hdr->bfd_section == NULL
@@ -5749,7 +5750,7 @@ assign_file_positions_for_non_load_sections (bfd *abfd,
if (m->includes_filehdr || m->includes_phdrs)
{
/* PR 17512: file: 2195325e. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: non-load segment includes file header and/or program header"),
abfd);
return FALSE;
@@ -6235,7 +6236,7 @@ _bfd_elf_symbol_from_bfd_symbol (bfd *abfd, asymbol **asym_ptr_ptr)
{
/* This case can occur when using --strip-symbol on a symbol
which is used in a relocation entry. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: symbol `%s' required but not present"),
abfd, bfd_asymbol_name (asym_ptr));
bfd_set_error (bfd_error_no_symbols);
@@ -6574,9 +6575,9 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
something. They are allowed by the ELF spec however, so only
a warning is produced. */
if (segment->p_type == PT_LOAD)
- (*_bfd_error_handler) (_("\
+ _bfd_error_handler (_("\
%B: warning: Empty loadable segment detected, is this intentional ?"),
- ibfd);
+ ibfd);
map->count = 0;
*pointer_to_map = map;
@@ -7187,9 +7188,9 @@ rewrite:
{
/* PR 17512: file: f17299af. */
if (segment->p_align > (bfd_vma) 1 << ((sizeof (bfd_vma) * 8) - 2))
- (*_bfd_error_handler) (_("\
+ _bfd_error_handler (_("\
%B: warning: segment alignment of 0x%llx is too large"),
- ibfd, (long long) segment->p_align);
+ ibfd, (long long) segment->p_align);
else
maxpagesize = segment->p_align;
}
@@ -7994,7 +7995,7 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bfd_boolean default_imported_symver)
if (hdr->sh_info == 0 || hdr->sh_size < sizeof (Elf_External_Verneed))
{
error_return_bad_verref:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: .gnu.version_r invalid entry"), abfd);
bfd_set_error (bfd_error_bad_value);
error_return_verref:
@@ -8121,7 +8122,7 @@ error_return_verref:
if (hdr->sh_info == 0 || hdr->sh_size < sizeof (Elf_External_Verdef))
{
error_return_bad_verdef:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: .gnu.version_d invalid entry"), abfd);
bfd_set_error (bfd_error_bad_value);
error_return_verdef:
@@ -8672,7 +8673,7 @@ _bfd_elf_validate_reloc (bfd *abfd, arelent *areloc)
return TRUE;
fail:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unsupported relocation type %s"),
abfd, areloc->howto->name);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index b726dab..9fb83b5 100644
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -613,7 +613,7 @@ arc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
else if (in_flags != out_flags)
{
/* Warn if different flags. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: uses different e_flags (0x%lx) fields than "
"previous modules (0x%lx)"),
bfd_get_filename (ibfd), (long)in_flags, (long)out_flags);
@@ -674,13 +674,13 @@ arc_elf_object_p (bfd * abfd)
{
if (e_machine == EM_ARC)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Error: The ARC4 architecture is no longer supported.\n"));
return FALSE;
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: unset or old architecture flags. \n"
" Use default machine.\n"));
}
@@ -807,7 +807,7 @@ arc_special_overflow_checks (const struct arc_relocation_data reloc_data,
if (((relocation >> 16) & 0xffff) != NPS_CMEM_HIGH_VALUE)
{
if (reloc_data.reloc_addend == 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): CMEM relocation to `%s' is invalid, "
"16 MSB should be 0x%04x (value is 0x%lx)"),
reloc_data.input_section->owner,
@@ -817,7 +817,7 @@ arc_special_overflow_checks (const struct arc_relocation_data reloc_data,
NPS_CMEM_HIGH_VALUE,
(relocation));
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): CMEM relocation to `%s+0x%lx' is invalid, "
"16 MSB should be 0x%04x (value is 0x%lx)"),
reloc_data.input_section->owner,
@@ -1493,8 +1493,8 @@ elf_arc_relocate_section (bfd * output_bfd,
if (is_reloc_SDA_relative (howto)
&& (reloc_data.sdata_begin_symbol_vma_set == FALSE))
{
- (*_bfd_error_handler)
- ("Error: Linker symbol __SDATA_BEGIN__ not found");
+ _bfd_error_handler
+ ("Error: Linker symbol __SDATA_BEGIN__ not found");
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -1506,7 +1506,7 @@ elf_arc_relocate_section (bfd * output_bfd,
if ((is_reloc_for_GOT (howto) || is_reloc_for_PLT (howto))
&& reloc_data.sym_section == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("GOT and PLT relocations cannot be fixed with a non dynamic linker."));
bfd_set_error (bfd_error_bad_value);
return FALSE;
@@ -1727,7 +1727,7 @@ elf_arc_check_relocs (bfd * abfd,
else
/* bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL); */
name = "UNKNOWN";
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("\
%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
abfd,
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index a5e048b..cafe1a2 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -4032,13 +4032,13 @@ arm_type_of_stub (struct bfd_link_info *info,
if (!thumb_only)
{
if (input_sec->flags & SEC_ELF_PURECODE)
- (*_bfd_error_handler) (_("%B(%s): warning: long branch "
- " veneers used in section with "
- "SHF_ARM_PURECODE section "
- "attribute is only supported"
- " for M-profile targets that "
- "implement the movw "
- "instruction."));
+ _bfd_error_handler (_("%B(%s): warning: long branch "
+ " veneers used in section with "
+ "SHF_ARM_PURECODE section "
+ "attribute is only supported"
+ " for M-profile targets that "
+ "implement the movw "
+ "instruction."));
stub_type = (bfd_link_pic (info) | globals->pic_veneer)
/* PIC stubs. */
@@ -4067,13 +4067,13 @@ arm_type_of_stub (struct bfd_link_info *info,
else
{
if (input_sec->flags & SEC_ELF_PURECODE)
- (*_bfd_error_handler) (_("%B(%s): warning: long branch "
- " veneers used in section with "
- "SHF_ARM_PURECODE section "
- "attribute is only supported"
- " for M-profile targets that "
- "implement the movw "
- "instruction."));
+ _bfd_error_handler (_("%B(%s): warning: long branch "
+ " veneers used in section with "
+ "SHF_ARM_PURECODE section "
+ "attribute is only supported"
+ " for M-profile targets that "
+ "implement the movw "
+ "instruction."));
stub_type = (bfd_link_pic (info) | globals->pic_veneer)
/* PIC stub. */
@@ -4087,20 +4087,20 @@ arm_type_of_stub (struct bfd_link_info *info,
else
{
if (input_sec->flags & SEC_ELF_PURECODE)
- (*_bfd_error_handler) (_("%B(%s): warning: long branch "
- " veneers used in section with "
- "SHF_ARM_PURECODE section "
- "attribute is only supported"
- " for M-profile targets that "
- "implement the movw "
- "instruction."));
+ _bfd_error_handler (_("%B(%s): warning: long branch "
+ " veneers used in section with "
+ "SHF_ARM_PURECODE section "
+ "attribute is only supported"
+ " for M-profile targets that "
+ "implement the movw "
+ "instruction."));
/* Thumb to arm. */
if (sym_sec != NULL
&& sym_sec->owner != NULL
&& !INTERWORK_FLAG (sym_sec->owner))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%s): warning: interworking not enabled.\n"
" first occurrence: %B: Thumb call to ARM"),
sym_sec->owner, input_bfd, name);
@@ -4140,13 +4140,13 @@ arm_type_of_stub (struct bfd_link_info *info,
|| r_type == R_ARM_TLS_CALL)
{
if (input_sec->flags & SEC_ELF_PURECODE)
- (*_bfd_error_handler) (_("%B(%s): warning: long branch "
- " veneers used in section with "
- "SHF_ARM_PURECODE section "
- "attribute is only supported"
- " for M-profile targets that "
- "implement the movw "
- "instruction."));
+ _bfd_error_handler (_("%B(%s): warning: long branch "
+ " veneers used in section with "
+ "SHF_ARM_PURECODE section "
+ "attribute is only supported"
+ " for M-profile targets that "
+ "implement the movw "
+ "instruction."));
if (branch_type == ST_BRANCH_TO_THUMB)
{
/* Arm to thumb. */
@@ -4155,7 +4155,7 @@ arm_type_of_stub (struct bfd_link_info *info,
&& sym_sec->owner != NULL
&& !INTERWORK_FLAG (sym_sec->owner))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%s): warning: interworking not enabled.\n"
" first occurrence: %B: ARM call to Thumb"),
sym_sec->owner, input_bfd, name);
@@ -4430,8 +4430,8 @@ elf32_arm_create_or_find_stub_sec (asection **link_sec_p, asection *section,
out_sec = bfd_get_section_by_name (output_bfd, out_sec_name);
if (out_sec == NULL)
{
- (*_bfd_error_handler) (_("No address assigned to the veneers output "
- "section %s"), out_sec_name);
+ _bfd_error_handler (_("No address assigned to the veneers output "
+ "section %s"), out_sec_name);
return NULL;
}
}
@@ -4505,9 +4505,8 @@ elf32_arm_add_stub (const char *stub_name, asection *section,
{
if (section == NULL)
section = stub_sec;
- (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
- section->owner,
- stub_name);
+ _bfd_error_handler (_("%s: cannot create stub entry %s"),
+ section->owner, stub_name);
return NULL;
}
@@ -5691,19 +5690,19 @@ cmse_scan (bfd *input_bfd, struct elf32_arm_link_hash_table *htab,
if (!is_v8m)
{
- (*_bfd_error_handler) (_("%B: Special symbol `%s' only allowed for "
- "ARMv8-M architecture or later."),
- input_bfd, sym_name);
+ _bfd_error_handler (_("%B: Special symbol `%s' only allowed for "
+ "ARMv8-M architecture or later."),
+ input_bfd, sym_name);
is_v8m = TRUE; /* Avoid multiple warning. */
ret = FALSE;
}
if (cmse_invalid)
{
- (*_bfd_error_handler) (_("%B: invalid special symbol `%s'."),
- input_bfd, sym_name);
- (*_bfd_error_handler) (_("It must be a global or weak function "
- "symbol."));
+ _bfd_error_handler (_("%B: invalid special symbol `%s'."),
+ input_bfd, sym_name);
+ _bfd_error_handler (_("It must be a global or weak function "
+ "symbol."));
ret = FALSE;
if (i < ext_start)
continue;
@@ -5739,13 +5738,13 @@ cmse_scan (bfd *input_bfd, struct elf32_arm_link_hash_table *htab,
if (hash || j < ext_start)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: invalid standard symbol `%s'."), input_bfd, sym_name);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("It must be a global or weak function symbol."));
}
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: absent standard symbol `%s'."), input_bfd, sym_name);
ret = FALSE;
if (!hash)
@@ -5757,7 +5756,7 @@ cmse_scan (bfd *input_bfd, struct elf32_arm_link_hash_table *htab,
if (cmse_hash->root.root.u.def.section != section)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' and its special symbol are in different sections."),
input_bfd, sym_name);
ret = FALSE;
@@ -5769,14 +5768,14 @@ cmse_scan (bfd *input_bfd, struct elf32_arm_link_hash_table *htab,
don't create any stubs. */
if (section->output_section == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: entry function `%s' not output."), input_bfd, sym_name);
continue;
}
if (hash->root.size == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: entry function `%s' is empty."), input_bfd, sym_name);
ret = FALSE;
}
@@ -5858,7 +5857,7 @@ arm_list_new_cmse_stub (struct bfd_hash_entry *gen_entry, void *gen_info)
return TRUE;
if (stub_entry->stub_offset == (bfd_vma) -1)
- (*_bfd_error_handler) (" %s", stub_entry->output_name);
+ _bfd_error_handler (" %s", stub_entry->output_name);
return TRUE;
}
@@ -5906,8 +5905,8 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
in_implib_bfd = htab->in_implib_bfd;
if (!htab->cmse_implib)
{
- (*_bfd_error_handler) (_("%B: --in-implib only supported for Secure "
- "Gateway import libraries."), in_implib_bfd);
+ _bfd_error_handler (_("%B: --in-implib only supported for Secure "
+ "Gateway import libraries."), in_implib_bfd);
return FALSE;
}
@@ -5952,10 +5951,10 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
|| (ARM_GET_SYM_BRANCH_TYPE (intsym->st_target_internal)
!= ST_BRANCH_TO_THUMB))
{
- (*_bfd_error_handler) (_("%B: invalid import library entry: `%s'."),
- in_implib_bfd, sym_name);
- (*_bfd_error_handler) (_("Symbol should be absolute, global and "
- "refer to Thumb functions."));
+ _bfd_error_handler (_("%B: invalid import library entry: `%s'."),
+ in_implib_bfd, sym_name);
+ _bfd_error_handler (_("Symbol should be absolute, global and "
+ "refer to Thumb functions."));
ret = FALSE;
continue;
}
@@ -5973,7 +5972,7 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
{
bfd_boolean new_stub;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Entry function `%s' disappeared from secure code."), sym_name);
hash = (struct elf32_arm_link_hash_entry *)
elf_link_hash_lookup (&(htab)->root, sym_name, TRUE, TRUE, TRUE);
@@ -5998,8 +5997,8 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
{
if (!cmse_entry_fct_p (hash))
{
- (*_bfd_error_handler) (_("`%s' refers to a non entry function."),
- sym_name);
+ _bfd_error_handler (_("`%s' refers to a non entry function."),
+ sym_name);
ret = FALSE;
}
continue;
@@ -6012,7 +6011,7 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
/* Check visibility hasn't changed. */
if (!!(flags & BSF_GLOBAL)
!= (hash->root.root.type == bfd_link_hash_defined))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: visibility of symbol `%s' has changed."), in_implib_bfd,
sym_name);
@@ -6022,8 +6021,8 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
/* Size should match that of a SG veneer. */
if (intsym->st_size != cmse_stub_size)
{
- (*_bfd_error_handler) (_("%B: incorrect size for symbol `%s'."),
- in_implib_bfd, sym_name);
+ _bfd_error_handler (_("%B: incorrect size for symbol `%s'."),
+ in_implib_bfd, sym_name);
ret = FALSE;
}
@@ -6040,7 +6039,7 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
/* Complain if stub offset not a multiple of stub size. */
if (stub_offset % cmse_stub_size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Offset of veneer for entry function `%s' not a multiple of "
"its size."), sym_name);
ret = FALSE;
@@ -6060,7 +6059,7 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
if (!info->out_implib_bfd && new_cmse_stubs_created != 0)
{
BFD_ASSERT (new_cmse_stubs_created > 0);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("new entry function(s) introduced but no output import library "
"specified:"));
bfd_hash_traverse (&htab->stub_hash_table, arm_list_new_cmse_stub, info);
@@ -6068,7 +6067,7 @@ set_cmse_veneer_addr_from_implib (struct bfd_link_info *info,
if (cmse_stub_array_start != cmse_stub_sec_vma)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Start address of `%s' is different from previous link."),
out_sec_name);
ret = FALSE;
@@ -6643,9 +6642,8 @@ elf32_arm_size_stubs (bfd *output_bfd,
TRUE, FALSE);
if (stub_entry == NULL)
{
- (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
- section->owner,
- stub_name);
+ _bfd_error_handler (_("%s: cannot create stub entry %s"),
+ section->owner, stub_name);
return FALSE;
}
@@ -7759,7 +7757,7 @@ bfd_elf32_arm_set_vfp11_fix (bfd *obfd, struct bfd_link_info *link_info)
default:
/* Give a warning, but do as the user requests anyway. */
- (*_bfd_error_handler) (_("%B: warning: selected VFP11 erratum "
+ _bfd_error_handler (_("%B: warning: selected VFP11 erratum "
"workaround is not necessary for target architecture"), obfd);
}
}
@@ -7785,7 +7783,7 @@ bfd_elf32_arm_set_stm32l4xx_fix (bfd *obfd, struct bfd_link_info *link_info)
{
if (globals->stm32l4xx_fix != BFD_ARM_STM32L4XX_FIX_NONE)
/* Give a warning, but do as the user requests anyway. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: selected STM32L4XX erratum "
"workaround is not necessary for target architecture"), obfd);
}
@@ -8323,8 +8321,8 @@ bfd_elf32_arm_vfp11_fix_veneer_locations (bfd *abfd,
(&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
if (myh == NULL)
- (*_bfd_error_handler) (_("%B: unable to find VFP11 veneer "
- "`%s'"), abfd, tmp_name);
+ _bfd_error_handler (_("%B: unable to find VFP11 veneer "
+ "`%s'"), abfd, tmp_name);
vma = myh->root.u.def.section->output_section->vma
+ myh->root.u.def.section->output_offset
@@ -8343,8 +8341,8 @@ bfd_elf32_arm_vfp11_fix_veneer_locations (bfd *abfd,
(&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
if (myh == NULL)
- (*_bfd_error_handler) (_("%B: unable to find VFP11 veneer "
- "`%s'"), abfd, tmp_name);
+ _bfd_error_handler (_("%B: unable to find VFP11 veneer "
+ "`%s'"), abfd, tmp_name);
vma = myh->root.u.def.section->output_section->vma
+ myh->root.u.def.section->output_offset
@@ -8409,8 +8407,8 @@ bfd_elf32_arm_stm32l4xx_fix_veneer_locations (bfd *abfd,
(&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
if (myh == NULL)
- (*_bfd_error_handler) (_("%B: unable to find STM32L4XX veneer "
- "`%s'"), abfd, tmp_name);
+ _bfd_error_handler (_("%B: unable to find STM32L4XX veneer "
+ "`%s'"), abfd, tmp_name);
vma = myh->root.u.def.section->output_section->vma
+ myh->root.u.def.section->output_offset
@@ -8428,8 +8426,8 @@ bfd_elf32_arm_stm32l4xx_fix_veneer_locations (bfd *abfd,
(&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
if (myh == NULL)
- (*_bfd_error_handler) (_("%B: unable to find STM32L4XX veneer "
- "`%s'"), abfd, tmp_name);
+ _bfd_error_handler (_("%B: unable to find STM32L4XX veneer "
+ "`%s'"), abfd, tmp_name);
vma = myh->root.u.def.section->output_section->vma
+ myh->root.u.def.section->output_offset
@@ -8633,7 +8631,7 @@ bfd_elf32_arm_stm32l4xx_erratum_scan (bfd *abfd,
{
if (is_not_last_in_it_block)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
/* Note - overlong line used here to allow for translation. */
(_("\
%B(%A+0x%lx): error: multiple load detected in non-last IT block instruction : STM32L4XX veneer cannot be generated.\n"
@@ -8820,7 +8818,7 @@ elf32_thumb_to_arm_stub (struct bfd_link_info * info,
&& sym_sec->owner != NULL
&& !INTERWORK_FLAG (sym_sec->owner))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%s): warning: interworking not enabled.\n"
" first occurrence: %B: Thumb call to ARM"),
sym_sec->owner, input_bfd, name);
@@ -8910,7 +8908,7 @@ elf32_arm_create_thumb_stub (struct bfd_link_info * info,
&& sym_sec->owner != NULL
&& !INTERWORK_FLAG (sym_sec->owner))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%s): warning: interworking not enabled.\n"
" first occurrence: %B: arm call to thumb"),
sym_sec->owner, input_bfd, name);
@@ -9736,7 +9734,7 @@ elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals,
error generation. */
insn = (insn << 16)
| bfd_get_16 (input_bfd, contents + rel->r_offset + 2);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"),
input_bfd, input_sec, (unsigned long)rel->r_offset, insn);
return bfd_reloc_notsupported;
@@ -9775,7 +9773,7 @@ elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals,
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"),
input_bfd, input_sec, (unsigned long)rel->r_offset, insn);
return bfd_reloc_notsupported;
@@ -10114,7 +10112,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
if (bfd_link_executable (info))
v = _("PIE executable");
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against external or undefined symbol `%s'"
" can not be used when making a %s; recompile with -fPIC"), input_bfd,
elf32_arm_howto_table_1[r_type].name, h->root.root.string, v);
@@ -10244,7 +10242,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
/* FIXME: Should we translate the instruction into a BL
instruction instead ? */
if (branch_type != ST_BRANCH_TO_THUMB)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("\%B: Warning: Arm BLX instruction targets Arm function '%s'."),
input_bfd,
h ? h->root.root.string : "(local)");
@@ -10664,7 +10662,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
/* FIXME: Should we translate the instruction into a BL
instruction instead ? */
if (branch_type == ST_BRANCH_TO_THUMB)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Warning: Thumb BLX instruction targets thumb function '%s'."),
input_bfd,
h ? h->root.root.string : "(local)");
@@ -11530,7 +11528,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
value = -5;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"),
input_bfd, input_section,
(unsigned long)rel->r_offset, insn);
@@ -11553,7 +11551,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"),
input_bfd, input_section,
(unsigned long)rel->r_offset, insn);
@@ -11582,7 +11580,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
case R_ARM_TLS_LE32:
if (bfd_link_dll (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"),
input_bfd, input_section,
(long) rel->r_offset, howto->name);
@@ -11795,7 +11793,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
negative = identify_add_or_sub (insn);
if (negative == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group relocations"),
input_bfd, input_section,
(long) rel->r_offset, howto->name);
@@ -11835,7 +11833,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
|| r_type == R_ARM_ALU_SB_G1
|| r_type == R_ARM_ALU_SB_G2) && residual != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
input_bfd, input_section,
(long) rel->r_offset, signed_value < 0 ? - signed_value : signed_value,
@@ -11925,7 +11923,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
/* Check for overflow. */
if (residual >= 0x1000)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
input_bfd, input_section,
(long) rel->r_offset, labs (signed_value), howto->name);
@@ -12010,7 +12008,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
/* Check for overflow. */
if (residual >= 0x100)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
input_bfd, input_section,
(long) rel->r_offset, labs (signed_value), howto->name);
@@ -12097,7 +12095,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
fit in eight bits.) */
if ((residual & 0x3) != 0 || residual >= 0x400)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
input_bfd, input_section,
(long) rel->r_offset, labs (signed_value), howto->name);
@@ -12360,7 +12358,7 @@ elf32_arm_relocate_section (bfd * output_bfd,
if (howto->rightshift
|| (howto->src_mask & (howto->src_mask + 1)))
{
- (*_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);
@@ -12470,7 +12468,7 @@ elf32_arm_relocate_section (bfd * output_bfd,
|| h->root.type == bfd_link_hash_defweak)
&& IS_ARM_TLS_RELOC (r_type) != (sym_type == STT_TLS))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((sym_type == STT_TLS
? _("%B(%A+0x%lx): %s used with TLS symbol %s")
: _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
@@ -12524,7 +12522,7 @@ elf32_arm_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
(_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
input_bfd,
input_section,
@@ -13009,7 +13007,7 @@ elf32_arm_set_private_flags (bfd *abfd, flagword flags)
if (EF_ARM_EABI_VERSION (flags) == EF_ARM_EABI_UNKNOWN)
{
if (flags & EF_ARM_INTERWORK)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"),
abfd);
else
@@ -14522,8 +14520,8 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info,
object file containing relocations but no symbol table. */
&& (r_symndx > STN_UNDEF || nsyms > 0))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"), abfd,
- r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd,
+ r_symndx);
return FALSE;
}
@@ -14678,7 +14676,7 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info,
case R_ARM_THM_MOVT_ABS:
if (bfd_link_pic (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
abfd, elf32_arm_howto_table_1[r_type].name,
(h) ? h->root.root.string : "a local symbol");
@@ -16453,7 +16451,7 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info
s = bfd_get_linker_section (dynobj, name);
if (s == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("could not find section %s"), name);
bfd_set_error (bfd_error_invalid_operation);
return FALSE;
@@ -17646,8 +17644,8 @@ make_branch_to_a8_stub (struct bfd_hash_entry *gen_entry,
This check is just to be on the safe side... */
if ((veneered_insn_loc & ~0xfff) == (veneer_entry_loc & ~0xfff))
{
- (*_bfd_error_handler) (_("%B: error: Cortex-A8 erratum stub is "
- "allocated in unsafe location"), abfd);
+ _bfd_error_handler (_("%B: error: Cortex-A8 erratum stub is "
+ "allocated in unsafe location"), abfd);
return FALSE;
}
@@ -17673,8 +17671,8 @@ make_branch_to_a8_stub (struct bfd_hash_entry *gen_entry,
{
/* There's not much we can do apart from complain if this
happens. */
- (*_bfd_error_handler) (_("%B: error: Cortex-A8 erratum stub out "
- "of range (input file too large)"), abfd);
+ _bfd_error_handler (_("%B: error: Cortex-A8 erratum stub out "
+ "of range (input file too large)"), abfd);
return FALSE;
}
@@ -18500,8 +18498,8 @@ elf32_arm_write_section (bfd *output_bfd,
if ((signed) branch_to_veneer < -(1 << 25)
|| (signed) branch_to_veneer >= (1 << 25))
- (*_bfd_error_handler) (_("%B: error: VFP11 veneer out of "
- "range"), output_bfd);
+ _bfd_error_handler (_("%B: error: VFP11 veneer out of "
+ "range"), output_bfd);
insn |= (branch_to_veneer >> 2) & 0xffffff;
contents[endianflip ^ target] = insn & 0xff;
@@ -18522,8 +18520,8 @@ elf32_arm_write_section (bfd *output_bfd,
if ((signed) branch_from_veneer < -(1 << 25)
|| (signed) branch_from_veneer >= (1 << 25))
- (*_bfd_error_handler) (_("%B: error: VFP11 veneer out of "
- "range"), output_bfd);
+ _bfd_error_handler (_("%B: error: VFP11 veneer out of "
+ "range"), output_bfd);
/* Original instruction. */
insn = errnode->u.v.branch->u.b.vfp_insn;
@@ -18572,7 +18570,7 @@ elf32_arm_write_section (bfd *output_bfd,
((signed) branch_to_veneer >= (1 << 24)) ?
branch_to_veneer - (1 << 24) : 0;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%#x): error: Cannot create STM32L4XX veneer. "
"Jump out of range by %ld bytes. "
"Cannot encode branch instruction. "),
@@ -18611,8 +18609,8 @@ elf32_arm_write_section (bfd *output_bfd,
STM32L4XX_ERRATUM_LDM_VENEER_SIZE) < -(1 << 24)
|| (signed) (veneer_r - veneer) >= (1 << 24))
{
- (*_bfd_error_handler) (_("%B: error: Cannot create STM32L4XX "
- "veneer."), output_bfd);
+ _bfd_error_handler (_("%B: error: Cannot create STM32L4XX "
+ "veneer."), output_bfd);
continue;
}
diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
index eea76a4..ecea3d7 100644
--- a/bfd/elf32-avr.c
+++ b/bfd/elf32-avr.c
@@ -3256,8 +3256,8 @@ avr_add_stub (const char *stub_name,
if (hsh == NULL)
{
- (*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
- NULL, stub_name);
+ _bfd_error_handler (_("%B: cannot create stub entry %s"),
+ NULL, stub_name);
return NULL;
}
diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
index b9d368f..6a3dabc 100644
--- 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,7 @@ 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
(_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
input_bfd,
input_section, (long) rel->r_offset, h->root.root.string);
@@ -1628,7 +1628,7 @@ bfin_relocate_section (bfd * output_bfd,
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): reloc against `%s': error %d"),
input_bfd, input_section,
(long) rel->r_offset, name, (int) r);
@@ -2728,7 +2728,7 @@ bfinfdpic_relocate_section (bfd * output_bfd,
osec, sym,
rel->r_addend))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"),
input_bfd, input_section, rel->r_offset, name);
return FALSE;
@@ -4473,7 +4473,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 +4906,7 @@ bfinfdpic_check_relocs (bfd *abfd, struct bfd_link_info *info,
default:
bad_reloc:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unsupported relocation type %i"),
abfd, ELF32_R_TYPE (rel->r_info));
return FALSE;
@@ -4980,9 +4980,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 +4995,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 +5154,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 +5270,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
diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c
index 9408024..3ef3ebc 100644
--- a/bfd/elf32-cr16.c
+++ b/bfd/elf32-cr16.c
@@ -675,8 +675,8 @@ elf_cr16_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
if (r_type >= R_CR16_MAX)
{
- (*_bfd_error_handler) (_("%B: unrecognised CR16 reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised CR16 reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_CR16_NONE;
}
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index e759745d..1722b75 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1170,7 +1170,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
|| (!h->def_dynamic
&& h->root.type == bfd_link_hash_undefweak)))))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((h->got.offset == (bfd_vma) -1)
? _("%B, section %A: No PLT nor GOT for relocation %s"
" against symbol `%s'")
@@ -1298,7 +1298,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
symbols. Make this an error; the compiler isn't
allowed to pass us these kinds of things. */
if (h == NULL)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against local symbol"),
input_bfd,
@@ -1306,7 +1306,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
cris_elf_howto_table[r_type].name,
rel->r_addend);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against symbol `%s'"),
input_bfd,
@@ -1332,7 +1332,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
|| (!h->def_dynamic
&& h->root.type == bfd_link_hash_undefweak))))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s is"
" not allowed for global symbol: `%s'"),
input_bfd,
@@ -1348,7 +1348,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
it's noticed if it happens elsewhere. */
if (sgot == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with no GOT created"),
input_bfd,
input_section,
@@ -1561,7 +1561,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
|| (!h->def_regular
&& h->root.type != bfd_link_hash_undefined)))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((h->root.type == bfd_link_hash_undefined)
/* We shouldn't get here for GCC-emitted code. */
? _("%B, section %A: relocation %s has an undefined"
@@ -1649,7 +1649,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
symbol *plus offset*. The GOT holds relocations for
symbols. Make this an error; the compiler isn't allowed
to pass us these kinds of things. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against symbol `%s'"),
input_bfd,
@@ -1802,7 +1802,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
relocations for symbols. Make this an error; the
compiler isn't allowed to pass us these kinds of
things. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against symbol `%s'"),
input_bfd,
@@ -1936,7 +1936,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
been emitted. */
&& h->root.type != bfd_link_hash_undefined)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s is"
" not allowed for symbol: `%s'"
" which is defined outside the program,"
@@ -1989,14 +1989,14 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
only. */
case R_CRIS_16_GOT_TPREL:
case R_CRIS_16_GOT_GD:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("(too many global variables for -fpic:"
" recompile with -fPIC)"));
break;
case R_CRIS_16_TPREL:
case R_CRIS_16_DTPREL:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("(thread-local data too big for -fpic or"
" -msmall-tls: recompile with -fPIC or"
" -mno-small-tls)"));
@@ -3228,7 +3228,7 @@ cris_elf_check_relocs (bfd *abfd,
that, we must insist on dynobj being a specific mach. */
if (bfd_get_mach (dynobj) == bfd_mach_cris_v10_v32)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A:\n v10/v32 compatible object %s"
" must not contain a PIC relocation"),
abfd, sec);
@@ -3336,7 +3336,7 @@ cris_elf_check_relocs (bfd *abfd,
case R_CRIS_32_GD:
if (bfd_link_pic (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A:\n relocation %s not valid"
" in a shared object;"
" typically an option mixup, recompile with -fPIC"),
@@ -3550,7 +3550,7 @@ cris_elf_check_relocs (bfd *abfd,
&& (sec->flags & SEC_READONLY) != 0)
{
/* FIXME: How do we make this optionally a warning only? */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A:\n relocation %s should not"
" be used in a shared object; recompile with -fPIC"),
abfd,
@@ -3972,7 +3972,7 @@ elf_cris_discard_excess_dso_dynamics (struct elf_cris_link_hash_entry *h,
if ((s->section->flags & SEC_READONLY) != 0)
{
/* FIXME: How do we make this optionally a warning only? */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section `%A', to symbol `%s':\n"
" relocation %s should not be used"
" in a shared object; recompile with -fPIC"),
@@ -4186,7 +4186,7 @@ cris_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (bfd_get_symbol_leading_char (ibfd)
!= bfd_get_symbol_leading_char (obfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(bfd_get_symbol_leading_char (ibfd) == '_'
? _("%B: uses _-prefixed symbols, but writing file with non-prefixed symbols")
: _("%B: uses non-prefixed symbols, but writing file with _-prefixed symbols"),
@@ -4206,7 +4206,7 @@ cris_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
|| (omach == bfd_mach_cris_v32
&& imach != bfd_mach_cris_v10_v32))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((imach == bfd_mach_cris_v32)
? _("%B contains CRIS v32 code, incompatible"
" with previous objects")
diff --git a/bfd/elf32-crx.c b/bfd/elf32-crx.c
index cc8bedf..c903f26 100644
--- a/bfd/elf32-crx.c
+++ b/bfd/elf32-crx.c
@@ -425,8 +425,8 @@ elf_crx_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
unsigned int r_type = ELF32_R_TYPE (dst->r_info);
if (r_type >= R_CRX_MAX)
{
- (*_bfd_error_handler) (_("%B: unrecognised CRX reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised CRX reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_CRX_NONE;
}
diff --git a/bfd/elf32-dlx.c b/bfd/elf32-dlx.c
index 0dcb706..4dac5cb 100644
--- a/bfd/elf32-dlx.c
+++ b/bfd/elf32-dlx.c
@@ -137,8 +137,9 @@ elf32_dlx_relocate16 (bfd *abfd,
/* Can not support a long jump to sections other then .text. */
if (strcmp (input_section->name, symbol->section->output_section->name) != 0)
{
- (*_bfd_error_handler) (_("BFD Link Error: branch (PC rel16) to section (%s) not supported"),
- symbol->section->output_section->name);
+ _bfd_error_handler
+ (_("BFD Link Error: branch (PC rel16) to section (%s) not supported"),
+ symbol->section->output_section->name);
return bfd_reloc_undefined;
}
@@ -199,8 +200,9 @@ elf32_dlx_relocate26 (bfd *abfd,
/* Can not support a long jump to sections other then .text */
if (strcmp (input_section->name, symbol->section->output_section->name) != 0)
{
- (*_bfd_error_handler) (_("BFD Link Error: jump (PC rel26) to section (%s) not supported"),
- symbol->section->output_section->name);
+ _bfd_error_handler
+ (_("BFD Link Error: jump (PC rel26) to section (%s) not supported"),
+ symbol->section->output_section->name);
return bfd_reloc_undefined;
}
diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
index 5990faa..5d8d330 100644
--- a/bfd/elf32-frv.c
+++ b/bfd/elf32-frv.c
@@ -6364,9 +6364,10 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
new_flags &= ~EF_FRV_PIC;
#ifdef DEBUG
- (*_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));
#endif
if (!elf_flags_init (obfd)) /* First call, no flags set. */
@@ -6514,7 +6515,7 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
old_flags &= ~ EF_FRV_PIC_FLAGS;
#ifndef FRV_NO_PIC_ERROR
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: compiled with %s and linked with modules that use non-pic relocations"),
bfd_get_filename (ibfd),
(new_flags & EF_FRV_BIGPIC) ? "-fPIC" : "-fpic");
@@ -6567,7 +6568,7 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (new_opt[0])
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: compiled with %s and linked with modules compiled with %s"),
bfd_get_filename (ibfd), new_opt, old_opt);
}
@@ -6579,7 +6580,7 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
{
old_flags |= new_partial;
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"),
bfd_get_filename (ibfd), (long)new_partial, (long)old_partial);
}
@@ -6600,11 +6601,11 @@ frv_elf_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));
}
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index be10c9b..439e0d8 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -591,9 +591,8 @@ hppa_add_stub (const char *stub_name,
TRUE, FALSE);
if (hsh == NULL)
{
- (*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
- section->owner,
- stub_name);
+ _bfd_error_handler (_("%B: cannot create stub entry %s"),
+ section->owner, stub_name);
return NULL;
}
@@ -842,7 +841,7 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
&& (!htab->has_22bit_branch
|| sym_value - 8 + (1 << (22 + 1)) >= (1 << (22 + 2))))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"),
hsh->target_section->owner,
stub_sec,
@@ -1280,7 +1279,7 @@ elf32_hppa_check_relocs (bfd *abfd,
case R_PARISC_DPREL21L:
if (bfd_link_pic (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s can not be used when making a shared object; recompile with -fPIC"),
abfd,
elf_hppa_howto_table[r_type].name);
@@ -2789,9 +2788,8 @@ get_local_syms (bfd *output_bfd, bfd *input_bfd, struct bfd_link_info *info)
}
else
{
- (*_bfd_error_handler) (_("%B: duplicate export stub %s"),
- input_bfd,
- stub_name);
+ _bfd_error_handler (_("%B: duplicate export stub %s"),
+ input_bfd, stub_name);
}
}
}
@@ -3443,7 +3441,7 @@ final_link_relocate (asection *input_section,
/* We must have a ldil instruction. It's too hard to find
and convert the associated add instruction, so issue an
error. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link"),
input_bfd,
input_section,
@@ -3608,7 +3606,7 @@ final_link_relocate (asection *input_section,
if (max_branch_offset != 0
&& value + addend + max_branch_offset >= 2*max_branch_offset)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"),
input_bfd,
input_section,
@@ -4298,7 +4296,7 @@ elf32_hppa_relocate_section (bfd *output_bfd,
{
if (rstatus == bfd_reloc_notsupported || !warned_undef)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): cannot handle %s for %s"),
input_bfd,
input_section,
@@ -4615,7 +4613,7 @@ elf32_hppa_finish_dynamic_sections (bfd *output_bfd,
!= (sgot->output_offset
+ sgot->output_section->vma))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_(".got section not immediately after .plt section"));
return FALSE;
}
diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c
index 4f6d727..ab68551 100644
--- a/bfd/elf32-i370.c
+++ b/bfd/elf32-i370.c
@@ -303,8 +303,8 @@ i370_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
r_type = ELF32_R_TYPE (dst->r_info);
if (r_type >= R_I370_max)
{
- (*_bfd_error_handler) (_("%B: unrecognised I370 reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised I370 reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_I370_NONE;
}
@@ -352,7 +352,7 @@ i370_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
else /* Incompatible flags. */
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)",
ibfd, (long) new_flags, (long) old_flags);
@@ -1074,9 +1074,8 @@ i370_elf_relocate_section (bfd *output_bfd,
if ((unsigned) r_type >= (unsigned) R_I370_max
|| !i370_elf_howto_table[(int)r_type])
{
- (*_bfd_error_handler) ("%B: unknown relocation type %d",
- input_bfd,
- (int) r_type);
+ _bfd_error_handler ("%B: unknown relocation type %d",
+ input_bfd, (int) r_type);
bfd_set_error (bfd_error_bad_value);
ret = FALSE;
@@ -1157,7 +1156,7 @@ i370_elf_relocate_section (bfd *output_bfd,
switch ((int) r_type)
{
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: unknown relocation type %d for symbol %s",
input_bfd, (int) r_type, sym_name);
@@ -1298,7 +1297,7 @@ i370_elf_relocate_section (bfd *output_bfd,
case (int) R_I370_COPY:
case (int) R_I370_RELATIVE:
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: Relocation %s is not yet supported for symbol %s.",
input_bfd,
i370_elf_howto_table[(int) r_type]->name,
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 17f86e8..14a99ba 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -383,8 +383,8 @@ elf_i386_rtype_to_howto (bfd *abfd, unsigned r_type)
&& ((indx = r_type - R_386_vt_offset) - R_386_ext2
>= R_386_vt - R_386_ext2))
{
- (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
- abfd, (int) r_type);
+ _bfd_error_handler (_("%B: invalid relocation type %d"),
+ abfd, (int) r_type);
indx = R_386_NONE;
}
/* PR 17512: file: 0f67f69d. */
@@ -1555,7 +1555,7 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
}
}
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: TLS transition from %s to %s against `%s' at 0x%lx "
"in section `%A' failed"),
abfd, sec, from->name, to->name, name,
@@ -1642,7 +1642,7 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
else
name = h->root.root.string;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: direct GOT relocation R_386_GOT32X against `%s' without base register can not be used when making a shared object"),
abfd, name);
return FALSE;
@@ -1898,9 +1898,8 @@ elf_i386_check_relocs (bfd *abfd,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd,
- r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
goto error_return;
}
@@ -2098,7 +2097,7 @@ elf_i386_check_relocs (bfd *abfd,
else
name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' accessed both as normal and "
"thread local symbol"),
abfd, name);
@@ -2186,7 +2185,7 @@ do_relocation:
else
name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unsupported non-PIC call to IFUNC `%s'"),
abfd, name);
bfd_set_error (bfd_error_bad_value);
@@ -3767,7 +3766,7 @@ elf_i386_relocate_section (bfd *output_bfd,
&& ((indx = r_type - R_386_tls_offset) - R_386_ext
>= R_386_ext2 - R_386_ext))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unrecognized relocation (0x%x) in section `%A'"),
input_bfd, input_section, r_type);
bfd_set_error (bfd_error_bad_value);
@@ -4046,7 +4045,7 @@ bad_ifunc_reloc:
else
name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against STT_GNU_IFUNC "
"symbol `%s' isn't supported"), input_bfd,
howto->name, name);
@@ -4293,7 +4292,7 @@ disallow_got32:
else
name = h->root.root.string;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: direct GOT relocation %s against `%s' without base register can not be used when making a shared object"),
input_bfd, howto->name, name);
bfd_set_error (bfd_error_bad_value);
@@ -4340,7 +4339,7 @@ disallow_got32:
break;
}
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"),
input_bfd, v, h->root.root.string);
bfd_set_error (bfd_error_bad_value);
@@ -4351,7 +4350,7 @@ disallow_got32:
|| h->type == STT_OBJECT)
&& ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation R_386_GOTOFF against protected %s `%s' can not be used when making a shared object"),
input_bfd,
h->type == STT_FUNC ? "function" : "data",
@@ -5142,7 +5141,7 @@ disallow_got32:
&& _bfd_elf_section_offset (output_bfd, info, input_section,
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,
@@ -5181,7 +5180,7 @@ check_relocation_error:
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): reloc against `%s': error %d"),
input_bfd, input_section,
(long) rel->r_offset, name, (int) r);
@@ -5855,7 +5854,7 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
{
if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("discarded output section: `%A'"), htab->elf.sgotplt);
return FALSE;
}
diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c
index 0c79397..d222d8c 100644
--- a/bfd/elf32-lm32.c
+++ b/bfd/elf32-lm32.c
@@ -1052,7 +1052,7 @@ lm32_elf_relocate_section (bfd *output_bfd,
/* Addend should be zero. */
if (rel->r_addend != 0)
- (*_bfd_error_handler) (_("internal error: addend should be zero for R_LM32_16_GOT"));
+ _bfd_error_handler (_("internal error: addend should be zero for R_LM32_16_GOT"));
r = _bfd_final_link_relocate (howto,
input_bfd,
@@ -1551,7 +1551,7 @@ lm32_elf_finish_dynamic_sections (bfd *output_bfd,
if (lm32fdpic_fixup32_section (info)->size
!= (lm32fdpic_fixup32_section (info)->reloc_count * 4))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("LINKER BUG: .rofixup section size mismatch: size/4 %d != relocs %d",
lm32fdpic_fixup32_section (info)->size/4,
lm32fdpic_fixup32_section (info)->reloc_count);
@@ -1573,7 +1573,7 @@ lm32_elf_finish_dynamic_sections (bfd *output_bfd,
BFD_ASSERT (hend->u.def.value == value);
if (hend->u.def.value != value)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("LINKER BUG: .rofixup section hend->u.def.value != value: %ld != %ld", hend->u.def.value, value);
return FALSE;
}
diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c
index 635d664..dbfd85c 100644
--- a/bfd/elf32-m32c.c
+++ b/bfd/elf32-m32c.c
@@ -830,9 +830,10 @@ m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
old_flags = elf_elfheader (obfd)->e_flags;
#ifdef DEBUG
- (*_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));
#endif
if (!elf_flags_init (obfd))
@@ -876,7 +877,7 @@ m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (new_opt[0])
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: compiled with %s and linked with modules compiled with %s"),
bfd_get_filename (ibfd), new_opt, old_opt);
}
@@ -888,7 +889,7 @@ m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (new_flags != old_flags)
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
bfd_get_filename (ibfd), (long)new_flags, (long)old_flags);
}
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index 7034c3d..f5d9495 100644
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -2444,9 +2444,8 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
r_type = ELF32_R_TYPE (rel->r_info);
if (r_type < 0 || r_type >= (int) R_M32R_max)
{
- (*_bfd_error_handler) (_("%B: unknown relocation type %d"),
- input_bfd,
- (int) r_type);
+ _bfd_error_handler (_("%B: unknown relocation type %d"),
+ input_bfd, (int) r_type);
bfd_set_error (bfd_error_bad_value);
ret = FALSE;
continue;
@@ -2565,7 +2564,7 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
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,
@@ -3009,7 +3008,7 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: The target (%s) of an %s relocation is in the wrong section (%A)"),
input_bfd,
sec,
@@ -3528,7 +3527,7 @@ m32r_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
|| ((out_flags & EF_M32R_ARCH) == E_M32R_ARCH)
|| ((in_flags & EF_M32R_ARCH) == E_M32R2_ARCH))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Instruction set mismatch with previous modules"), ibfd);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c
index 4824fde..600ba54 100644
--- a/bfd/elf32-m68hc1x.c
+++ b/bfd/elf32-m68hc1x.c
@@ -161,8 +161,8 @@ m68hc12_add_stub (const char *stub_name, asection *section,
TRUE, FALSE);
if (stub_entry == NULL)
{
- (*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
- section->owner, stub_name);
+ _bfd_error_handler (_("%B: cannot create stub entry %s"),
+ section->owner, stub_name);
return NULL;
}
@@ -1347,14 +1347,14 @@ _bfd_m68hc11_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
/* Check ABI compatibility. */
if ((new_flags & E_M68HC11_I32) != (old_flags & E_M68HC11_I32))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking files compiled for 16-bit integers (-mshort) "
"and others for 32-bit integers"), ibfd);
ok = FALSE;
}
if ((new_flags & E_M68HC11_F64) != (old_flags & E_M68HC11_F64))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking files compiled for 32-bit double (-fshort-double) "
"and others for 64-bit double"), ibfd);
ok = FALSE;
@@ -1363,7 +1363,7 @@ _bfd_m68hc11_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
/* Processor compatibility. */
if (!EF_M68HC11_CAN_MERGE_MACH (new_flags, old_flags))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking files compiled for HCS12 with "
"others compiled for HC12"), ibfd);
ok = FALSE;
@@ -1379,7 +1379,7 @@ _bfd_m68hc11_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
/* Warn about any other mismatches */
if (new_flags != old_flags)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
ibfd, (unsigned long) new_flags, (unsigned long) old_flags);
ok = FALSE;
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 4681556..8e37185 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -348,8 +348,8 @@ rtype_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
if (indx >= (unsigned int) R_68K_max)
{
- (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
- abfd, (int) indx);
+ _bfd_error_handler (_("%B: invalid relocation type %d"),
+ abfd, (int) indx);
indx = R_68K_NONE;
}
cache_ptr->howto = &howto_table[indx];
@@ -1670,17 +1670,17 @@ elf_m68k_add_entry_to_got (struct elf_m68k_got *got,
/* This BFD has too many relocation. */
{
if (got->n_slots[R_8] > ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info))
- (*_bfd_error_handler) (_("%B: GOT overflow: "
- "Number of relocations with 8-bit "
- "offset > %d"),
- abfd,
- ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info));
+ _bfd_error_handler (_("%B: GOT overflow: "
+ "Number of relocations with 8-bit "
+ "offset > %d"),
+ abfd,
+ ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info));
else
- (*_bfd_error_handler) (_("%B: GOT overflow: "
- "Number of relocations with 8- or 16-bit "
- "offset > %d"),
- abfd,
- ELF_M68K_R_8_16_MAX_N_SLOTS_IN_GOT (info));
+ _bfd_error_handler (_("%B: GOT overflow: "
+ "Number of relocations with 8- or 16-bit "
+ "offset > %d"),
+ abfd,
+ ELF_M68K_R_8_16_MAX_N_SLOTS_IN_GOT (info));
return NULL;
}
@@ -3918,7 +3918,7 @@ elf_m68k_relocate_section (bfd *output_bfd,
case R_68K_TLS_LE8:
if (bfd_link_dll (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted "
"in shared object"),
input_bfd, input_section, (long) rel->r_offset, howto->name);
@@ -4117,7 +4117,7 @@ elf_m68k_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
(_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
input_bfd,
input_section,
@@ -4151,7 +4151,7 @@ elf_m68k_relocate_section (bfd *output_bfd,
name = bfd_section_name (input_bfd, sec);
}
- (*_bfd_error_handler)
+ _bfd_error_handler
((sym_type == STT_TLS
? _("%B(%A+0x%lx): %s used with TLS symbol %s")
: _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
@@ -4190,7 +4190,7 @@ elf_m68k_relocate_section (bfd *output_bfd,
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): reloc against `%s': error %d"),
input_bfd, input_section,
(long) rel->r_offset, name, (int) r);
diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c
index e2851e2..7b04e7a 100644
--- a/bfd/elf32-mcore.c
+++ b/bfd/elf32-mcore.c
@@ -349,8 +349,8 @@ mcore_elf_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED,
r_type = ELF32_R_TYPE (dst->r_info);
if (r_type >= R_MCORE_max)
{
- (*_bfd_error_handler) (_("%B: unrecognised MCore reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised MCore reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_MCORE_NONE;
}
diff --git a/bfd/elf32-mep.c b/bfd/elf32-mep.c
index 0d18206..630d0e3 100644
--- a/bfd/elf32-mep.c
+++ b/bfd/elf32-mep.c
@@ -136,14 +136,14 @@ mep_reloc_type_lookup
default:
/* Pacify gcc -Wall. */
- (*_bfd_error_handler) (_("mep: no reloc for code %d"), code);
+ _bfd_error_handler (_("mep: no reloc for code %d"), code);
return NULL;
}
if (mep_elf_howto_table[type].type != type)
{
- (*_bfd_error_handler) (_("MeP: howto %d has type %d"),
- type, mep_elf_howto_table[type].type);
+ _bfd_error_handler (_("MeP: howto %d has type %d"),
+ type, mep_elf_howto_table[type].type);
abort ();
}
diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
index 84f7f11..75e06d7 100644
--- a/bfd/elf32-metag.c
+++ b/bfd/elf32-metag.c
@@ -1202,9 +1202,8 @@ metag_add_stub (const char *stub_name,
TRUE, FALSE);
if (hsh == NULL)
{
- (*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
- section->owner,
- stub_name);
+ _bfd_error_handler (_("%B: cannot create stub entry %s"),
+ section->owner, stub_name);
return NULL;
}
@@ -1928,7 +1927,7 @@ elf_metag_relocate_section (bfd *output_bfd,
case R_METAG_TLS_LE_LO16:
if (bfd_link_pic (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): R_METAG_TLS_LE/IENONPIC relocation not permitted in shared object"),
input_bfd, input_section,
(long) rel->r_offset, howto->name);
@@ -2286,7 +2285,7 @@ elf_metag_check_relocs (bfd *abfd,
name = hh->eh.root.root.string;
else
name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
abfd, elf_metag_howto_table[r_type].name, name);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index 5496d16..cc4b3cc 100644
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -652,8 +652,8 @@ microblaze_elf_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED,
r_type = ELF32_R_TYPE (dst->r_info);
if (r_type >= R_MICROBLAZE_max)
{
- (*_bfd_error_handler) (_("%B: unrecognised MicroBlaze reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised MicroBlaze reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_MICROBLAZE_NONE;
}
@@ -956,8 +956,8 @@ microblaze_elf_relocate_section (bfd *output_bfd,
if (r_type < 0 || r_type >= (int) R_MICROBLAZE_max)
{
- (*_bfd_error_handler) (_("%s: unknown relocation type %d"),
- bfd_get_filename (input_bfd), (int) r_type);
+ _bfd_error_handler (_("%s: unknown relocation type %d"),
+ bfd_get_filename (input_bfd), (int) r_type);
bfd_set_error (bfd_error_bad_value);
ret = FALSE;
continue;
@@ -1082,11 +1082,13 @@ microblaze_elf_relocate_section (bfd *output_bfd,
}
else
{
- (*_bfd_error_handler) (_("%s: The target (%s) of an %s relocation is in the wrong section (%s)"),
- bfd_get_filename (input_bfd),
- sym_name,
- microblaze_elf_howto_table[(int) r_type]->name,
- bfd_get_section_name (sec->owner, sec));
+ _bfd_error_handler
+ (_("%s: The target (%s) of an %s relocation "
+ "is in the wrong section (%s)"),
+ bfd_get_filename (input_bfd),
+ sym_name,
+ microblaze_elf_howto_table[(int) r_type]->name,
+ bfd_get_section_name (sec->owner, sec));
/*bfd_set_error (bfd_error_bad_value); ??? why? */
ret = FALSE;
continue;
@@ -1127,11 +1129,13 @@ microblaze_elf_relocate_section (bfd *output_bfd,
}
else
{
- (*_bfd_error_handler) (_("%s: The target (%s) of an %s relocation is in the wrong section (%s)"),
- bfd_get_filename (input_bfd),
- sym_name,
- microblaze_elf_howto_table[(int) r_type]->name,
- bfd_get_section_name (sec->owner, sec));
+ _bfd_error_handler
+ (_("%s: The target (%s) of an %s relocation "
+ "is in the wrong section (%s)"),
+ bfd_get_filename (input_bfd),
+ sym_name,
+ microblaze_elf_howto_table[(int) r_type]->name,
+ bfd_get_section_name (sec->owner, sec));
/*bfd_set_error (bfd_error_bad_value); ??? why? */
ret = FALSE;
continue;
@@ -1492,7 +1496,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
else
{
BFD_FAIL ();
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: probably compiled without -fPIC?"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 029de27..4438ee8 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -2222,7 +2222,7 @@ mips_elf32_rtype_to_howto (unsigned int r_type,
return &elf_mips16_howto_table_rel[r_type - R_MIPS16_min];
if (r_type >= (unsigned int) R_MIPS_max)
{
- (*_bfd_error_handler) (_("Unrecognised MIPS reloc number: %d"), r_type);
+ _bfd_error_handler (_("Unrecognised MIPS reloc number: %d"), r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_MIPS_NONE;
}
diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c
index 09d26ae..fc47c7f 100644
--- a/bfd/elf32-nds32.c
+++ b/bfd/elf32-nds32.c
@@ -3303,7 +3303,7 @@ nds32_elf_final_sda_base (bfd *output_bfd, struct bfd_link_info *info,
}
else
{
- (*_bfd_error_handler) (_("error: Can't find symbol: _SDA_BASE_."));
+ _bfd_error_handler (_("error: Can't find symbol: _SDA_BASE_."));
return bfd_reloc_dangerous;
}
}
@@ -4519,15 +4519,15 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
/* Set the _ITB_BASE_. */
if (!nds32_elf_ex9_itb_base (info))
{
- (*_bfd_error_handler) (_("%B: error: Cannot set _ITB_BASE_"),
- output_bfd);
+ _bfd_error_handler (_("%B: error: Cannot set _ITB_BASE_"),
+ output_bfd);
bfd_set_error (bfd_error_bad_value);
}
}
if (table->target_optimize & NDS32_RELAX_JUMP_IFC_ON)
if (!nds32_elf_ifc_reloc ())
- (*_bfd_error_handler) (_("error: IFC relocation error."));
+ _bfd_error_handler (_("error: IFC relocation error."));
/* Relocation for .ex9.itable. */
if (table->target_optimize & NDS32_RELAX_EX9_ON
@@ -4560,8 +4560,8 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
r_type = ELF32_R_TYPE (rel->r_info);
if (r_type >= R_NDS32_max)
{
- (*_bfd_error_handler) (_("%B: error: unknown relocation type %d."),
- input_bfd, r_type);
+ _bfd_error_handler (_("%B: error: unknown relocation type %d."),
+ input_bfd, r_type);
bfd_set_error (bfd_error_bad_value);
ret = FALSE;
continue;
@@ -5005,7 +5005,7 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
case R_NDS32_25_ABS_RELA:
if (bfd_link_pic (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: cannot deal R_NDS32_25_ABS_RELA in shared "
"mode."), bfd_get_filename (input_bfd));
return FALSE;
@@ -5139,7 +5139,7 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
if (relocation & align)
{
/* Incorrect alignment. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: unaligned access to GOT entry."), input_bfd);
ret = FALSE;
r = bfd_reloc_dangerous;
@@ -5181,7 +5181,7 @@ handle_sda:
r = nds32_elf_final_sda_base (output_bfd, info, &gp, FALSE);
if (r != bfd_reloc_ok)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: relocate SDA_BASE failed."), input_bfd);
ret = FALSE;
goto check_reloc;
@@ -5202,7 +5202,7 @@ handle_sda:
if (relocation & align)
{
/* Incorrect alignment. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A): warning: unaligned small data access of type %d."),
input_bfd, input_section, r_type);
ret = FALSE;
@@ -5967,11 +5967,12 @@ nds32_check_vec_size (bfd *ibfd)
nds32_vec_size = (flag_t & 0x3);
else if (nds32_vec_size != (flag_t & 0x3))
{
- (*_bfd_error_handler) (_("%B: ISR vector size mismatch"
- " with previous modules, previous %u-byte, current %u-byte"),
- ibfd,
- nds32_vec_size == 1 ? 4 : nds32_vec_size == 2 ? 16 : 0xffffffff,
- (flag_t & 0x3) == 1 ? 4 : (flag_t & 0x3) == 2 ? 16 : 0xffffffff);
+ _bfd_error_handler
+ (_("%B: ISR vector size mismatch"
+ " with previous modules, previous %u-byte, current %u-byte"),
+ ibfd,
+ nds32_vec_size == 1 ? 4 : nds32_vec_size == 2 ? 16 : 0xffffffff,
+ (flag_t & 0x3) == 1 ? 4 : (flag_t & 0x3) == 2 ? 16 : 0xffffffff);
return FALSE;
}
else
@@ -6009,7 +6010,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (bfd_little_endian (ibfd) != bfd_little_endian (obfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Endian mismatch with previous modules."), ibfd);
bfd_set_error (bfd_error_bad_value);
@@ -6019,7 +6020,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
in_version = elf_elfheader (ibfd)->e_flags & EF_NDS32_ELF_VERSION;
if (in_version == E_NDS32_ELF_VER_1_2)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Older version of object file encountered, "
"Please recompile with current tool chain."), ibfd);
}
@@ -6097,7 +6098,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
/* Check flag compatibility. */
if ((in_flags & EF_NDS_ABI) != (out_flags & EF_NDS_ABI))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: error: ABI mismatch with previous modules."), ibfd);
bfd_set_error (bfd_error_bad_value);
@@ -6108,7 +6109,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
{
if (((in_flags & EF_NDS_ARCH) != E_N1_ARCH))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: error: Instruction set mismatch with previous modules."), ibfd);
bfd_set_error (bfd_error_bad_value);
@@ -6133,9 +6134,10 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
else
{
if (in_version != out_version)
- (*_bfd_error_handler) (_("%B: warning: Incompatible elf-versions %s and %s."),
- ibfd, nds32_elfver_strtab[out_version],
- nds32_elfver_strtab[in_version]);
+ _bfd_error_handler
+ (_("%B: warning: Incompatible elf-versions %s and %s."),
+ ibfd, nds32_elfver_strtab[out_version],
+ nds32_elfver_strtab[in_version]);
elf_elfheader (obfd)->e_flags = in_flags | out_flags
| (in_16regs & out_16regs) | (in_no_mac & out_no_mac)
@@ -8772,7 +8774,7 @@ done_adjust_diff:
if (blank_t2 && blank_t2->next
&& (blank_t2->offset > raddr
|| blank_t2->next->offset <= raddr))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: %s\n"), abfd,
"Error: search_nds32_elf_blank reports wrong node");
@@ -9081,7 +9083,7 @@ nds32_elf_relax_longcall1 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL1 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9163,7 +9165,7 @@ nds32_elf_relax_longcall2 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (i1_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL2 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9270,7 +9272,7 @@ nds32_elf_relax_longcall3 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL3 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9405,7 +9407,7 @@ nds32_elf_relax_longjump1 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_LO12S0_ORI_RELA, laddr + 4);
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP1 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9612,7 +9614,7 @@ nds32_elf_relax_longjump2 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (i2_irelfn == irelend || cond_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP2 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9805,7 +9807,7 @@ nds32_elf_relax_longjump3 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irelfn == irelend || lo_irelfn == irelend || cond_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP3 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9986,7 +9988,7 @@ nds32_elf_relax_longcall4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL4 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10017,7 +10019,7 @@ nds32_elf_relax_longcall4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (ptr_irel == irelend || em_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL4 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10089,7 +10091,7 @@ nds32_elf_relax_longcall5 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_25_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL5 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10168,7 +10170,7 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (em_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10207,7 +10209,7 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_PTR_RESOLVED, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10257,7 +10259,7 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_PTR_RESOLVED, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10308,7 +10310,7 @@ nds32_elf_relax_longjump4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP4 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10331,7 +10333,7 @@ nds32_elf_relax_longjump4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (ptr_irel == irelend || em_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP4 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10406,7 +10408,7 @@ nds32_elf_relax_longjump5 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_25_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP5 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10536,7 +10538,7 @@ nds32_elf_relax_longjump6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (em_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP6 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10707,7 +10709,7 @@ nds32_elf_relax_longjump7 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_15_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP7 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10813,7 +10815,7 @@ nds32_elf_relax_loadstore (struct bfd_link_info *link_info, bfd *abfd,
if (hi_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LOADSTORE points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -11285,7 +11287,7 @@ nds32_elf_relax_ptr (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (re_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_PTR points to unrecognized reloc at 0x%lx.",
abfd, (long) irel->r_offset);
return FALSE;
@@ -11906,7 +11908,7 @@ nds32_elf_pick_relax (bfd_boolean init, asection *sec, bfd_boolean *again,
break;
case NDS32_RELAX_JUMP_IFC_ROUND:
if (!nds32_elf_ifc_finish (link_info))
- (*_bfd_error_handler) (_("error: Jump IFC Fail."));
+ _bfd_error_handler (_("error: Jump IFC Fail."));
if (table->target_optimize & NDS32_RELAX_EX9_ON)
{
pass++;
@@ -11923,7 +11925,7 @@ nds32_elf_pick_relax (bfd_boolean init, asection *sec, bfd_boolean *again,
{
/* Do jump IFC optimization again. */
if (!nds32_elf_ifc_finish (link_info))
- (*_bfd_error_handler) (_("error: Jump IFC Fail."));
+ _bfd_error_handler (_("error: Jump IFC Fail."));
}
break;
default:
@@ -12034,7 +12036,7 @@ nds32_elf_relax_section (bfd *abfd, asection *sec,
/* Set the _ITB_BASE_. */
if (!nds32_elf_ex9_itb_base (link_info))
{
- (*_bfd_error_handler) (_("%B: error: Cannot set _ITB_BASE_"), abfd);
+ _bfd_error_handler (_("%B: error: Cannot set _ITB_BASE_"), abfd);
bfd_set_error (bfd_error_bad_value);
}
}
@@ -12779,7 +12781,7 @@ nds32_relax_fp_as_gp (struct bfd_link_info *link_info,
{
/* Begin of the region. */
if (begin_rel)
- (*_bfd_error_handler) (_("%B: Nested OMIT_FP in %A."), abfd, sec);
+ _bfd_error_handler (_("%B: Nested OMIT_FP in %A."), abfd, sec);
begin_rel = irel;
nds32_fag_init (&fag_head);
@@ -12797,7 +12799,7 @@ nds32_relax_fp_as_gp (struct bfd_link_info *link_info,
if (begin_rel == NULL)
{
- (*_bfd_error_handler) (_("%B: Unmatched OMIT_FP in %A."), abfd, sec);
+ _bfd_error_handler (_("%B: Unmatched OMIT_FP in %A."), abfd, sec);
continue;
}
@@ -14855,7 +14857,7 @@ nds32_elf_ex9_init (void)
sizeof (struct elf_nds32_code_hash_entry),
1023))
{
- (*_bfd_error_handler) (_("Linker: cannot init ex9 hash table error \n"));
+ _bfd_error_handler (_("Linker: cannot init ex9 hash table error \n"));
return FALSE;
}
return TRUE;
@@ -15263,7 +15265,7 @@ nds32_elf_ex9_reloc_jmp (struct bfd_link_info *link_info)
if (!nds32_get_section_contents
(fix_ptr->sec->owner, fix_ptr->sec,
&source_contents, TRUE))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Linker: error cannot fixed ex9 relocation \n"));
if (temp_ptr->order < 32)
insn_ex9 = INSN_EX9_IT_2;
@@ -15277,7 +15279,7 @@ nds32_elf_ex9_reloc_jmp (struct bfd_link_info *link_info)
else
{
if (!temp_ptr->next || temp_ptr->m_list != temp_ptr->next->m_list)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Linker: error cannot fixed ex9 relocation \n"));
else
temp_ptr = temp_ptr->next;
@@ -15487,7 +15489,7 @@ nds32_elf_ex9_build_hash_table (bfd *abfd, asection *sec,
if (relocation & align)
{
/* Incorrect alignment. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: unaligned small data access. "
"For entry: {%d, %d, %d}, addr = 0x%x, align = 0x%x."),
bfd_get_filename (abfd), irel->r_offset,
@@ -15520,7 +15522,7 @@ nds32_elf_ex9_build_hash_table (bfd *abfd, asection *sec,
bfd_hash_lookup (&ex9_code_table, code, TRUE, TRUE);
if (entry == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%P%F: failed creating ex9.it %s hash table: %E\n"), code);
return FALSE;
}
diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
index d85fc69..f56460a 100644
--- a/bfd/elf32-nios2.c
+++ b/bfd/elf32-nios2.c
@@ -2225,9 +2225,9 @@ nios2_add_stub (const char *stub_name,
TRUE, FALSE);
if (hsh == NULL)
{
- (*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
- section->owner,
- stub_name);
+ _bfd_error_handler (_("%B: cannot create stub entry %s"),
+ section->owner,
+ stub_name);
return NULL;
}
@@ -2945,7 +2945,7 @@ nios2_elf32_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
case EF_NIOS2_ARCH_R2:
if (bfd_big_endian (ibfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("error: %B: Big-endian R2 is not supported."), ibfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;
@@ -2960,7 +2960,7 @@ nios2_elf32_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
{
/* So far, the only incompatible flags denote incompatible
architectures. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("error: %B: Conflicting CPU architectures %d/%d"),
ibfd, new_flags, old_flags);
bfd_set_error (bfd_error_bad_value);
@@ -4365,7 +4365,7 @@ nios2_elf32_relocate_section (bfd *output_bfd,
case R_NIOS2_TLS_LE16:
if (bfd_link_dll (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): R_NIOS2_TLS_LE16 relocation not "
"permitted in shared object"),
input_bfd, input_section,
@@ -5532,8 +5532,8 @@ nios2_elf32_adjust_dynamic_symbol (struct bfd_link_info *info,
if (h->size == 0)
{
- (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
- h->root.root.string);
+ _bfd_error_handler (_("dynamic variable `%s' is zero size"),
+ h->root.root.string);
return TRUE;
}
diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c
index 3351ba6..19491c0 100644
--- a/bfd/elf32-or1k.c
+++ b/bfd/elf32-or1k.c
@@ -989,7 +989,7 @@ or1k_elf_relocate_section (bfd *output_bfd,
/* Addend should be zero. */
if (rel->r_addend != 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("internal error: addend should be zero for R_OR1K_GOT16"));
break;
@@ -1076,7 +1076,7 @@ or1k_elf_relocate_section (bfd *output_bfd,
else
{
BFD_FAIL ();
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: probably compiled without -fPIC?"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
@@ -1098,7 +1098,7 @@ or1k_elf_relocate_section (bfd *output_bfd,
case R_OR1K_TLS_LDO_LO16:
/* TODO: implement support for local dynamic. */
BFD_FAIL ();
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: support for local dynamic not implemented"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
@@ -1233,7 +1233,7 @@ or1k_elf_relocate_section (bfd *output_bfd,
/* These are resolved dynamically on load and shouldn't
be used as linker input. */
BFD_FAIL ();
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: will not resolve runtime TLS relocation"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
@@ -1642,7 +1642,7 @@ or1k_elf_check_relocs (bfd *abfd,
|| strcmp (bfd_get_section_name (abfd, sec),
name + 5) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad relocation section name `%s\'"),
abfd, name);
}
@@ -2790,7 +2790,7 @@ elf32_or1k_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if ((in_flags & EF_OR1K_NODELAY) != (out_flags & EF_OR1K_NODELAY))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: EF_OR1K_NODELAY flag mismatch with previous modules"), ibfd);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/elf32-pj.c b/bfd/elf32-pj.c
index e3ebdaf..a129d61 100644
--- a/bfd/elf32-pj.c
+++ b/bfd/elf32-pj.c
@@ -321,8 +321,8 @@ pj_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
if (r >= R_PJ_max)
{
- (*_bfd_error_handler) (_("%B: unrecognised PicoJava reloc number: %d"),
- abfd, r);
+ _bfd_error_handler (_("%B: unrecognised PicoJava reloc number: %d"),
+ abfd, r);
bfd_set_error (bfd_error_bad_value);
r = R_PJ_NONE;
}
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index dd56a95..f631b27 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -2041,8 +2041,8 @@ ppc_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
r_type = ELF32_R_TYPE (dst->r_info);
if (r_type >= R_PPC_max)
{
- (*_bfd_error_handler) (_("%B: unrecognised PPC reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised PPC reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_PPC_NONE;
}
@@ -2052,8 +2052,8 @@ ppc_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
ELF32_R_TYPE (dst->r_info) is necessarily a valid relocation. */
if (!cache_ptr->howto)
{
- (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: invalid relocation type %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
cache_ptr->howto = ppc_elf_howto_table[R_PPC_NONE];
@@ -2827,7 +2827,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, ibfd, APUINFO_SECTION_NAME);
}
/* Prevent the output section from accumulating the input sections'
@@ -2867,7 +2867,7 @@ ppc_elf_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED)
buffer = bfd_malloc (length);
if (buffer == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("failed to allocate space for new APUinfo section."));
return;
}
@@ -2887,10 +2887,10 @@ ppc_elf_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED)
}
if (length != asec->size)
- (*_bfd_error_handler) (_("failed to compute new APUinfo section."));
+ _bfd_error_handler (_("failed to compute new APUinfo section."));
if (! bfd_set_section_contents (abfd, asec, buffer, (file_ptr) 0, length))
- (*_bfd_error_handler) (_("failed to install new APUinfo section."));
+ _bfd_error_handler (_("failed to install new APUinfo section."));
free (buffer);
@@ -3968,7 +3968,7 @@ is_branch_reloc (enum elf_ppc_reloc_type r_type)
static void
bad_shared_reloc (bfd *abfd, enum elf_ppc_reloc_type r_type)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s cannot be used when making a shared object"),
abfd,
ppc_elf_howto_table[r_type]->name);
@@ -4848,7 +4848,7 @@ ppc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
&& (old_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0)
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: compiled with -mrelocatable and linked with "
"modules compiled normally"), ibfd);
}
@@ -4856,7 +4856,7 @@ ppc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
&& (old_flags & EF_PPC_RELOCATABLE) != 0)
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: compiled normally and linked with "
"modules compiled with -mrelocatable"), ibfd);
}
@@ -4883,7 +4883,7 @@ ppc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (new_flags != old_flags)
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: uses different e_flags (0x%lx) fields "
"than previous modules (0x%lx)"),
ibfd, (long) new_flags, (long) old_flags);
@@ -9352,7 +9352,7 @@ ppc_elf_relocate_section (bfd *output_bfd,
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: the target (%s) of a %s relocation is "
"in the wrong output section (%s)"),
input_bfd,
diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c
index 70011f9..3ba426f 100644
--- a/bfd/elf32-rl78.c
+++ b/bfd/elf32-rl78.c
@@ -1192,7 +1192,7 @@ rl78_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
but that is still incompatible with the G10 ABI. */
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("RL78 ABI conflict: G10 file %s cannot be linked with %s file %s"),
bfd_get_filename (ibfd),
rl78_cpu_name (out_cpu), bfd_get_filename (obfd));
@@ -1208,7 +1208,7 @@ rl78_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("RL78 ABI conflict: cannot link %s file %s with %s file %s"),
rl78_cpu_name (in_cpu), bfd_get_filename (ibfd),
rl78_cpu_name (out_cpu), bfd_get_filename (obfd));
@@ -1217,15 +1217,15 @@ rl78_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
if (changed_flags & E_FLAG_RL78_64BIT_DOUBLES)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("RL78 merge conflict: cannot link 32-bit and 64-bit objects together"));
if (old_flags & E_FLAG_RL78_64BIT_DOUBLES)
- (*_bfd_error_handler) (_("- %s is 64-bit, %s is not"),
- bfd_get_filename (obfd), bfd_get_filename (ibfd));
+ _bfd_error_handler (_("- %s is 64-bit, %s is not"),
+ bfd_get_filename (obfd), bfd_get_filename (ibfd));
else
- (*_bfd_error_handler) (_("- %s is 64-bit, %s is not"),
- bfd_get_filename (ibfd), bfd_get_filename (obfd));
+ _bfd_error_handler (_("- %s is 64-bit, %s is not"),
+ bfd_get_filename (ibfd), bfd_get_filename (obfd));
error = TRUE;
}
}
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index b1627c9..921268f 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -342,8 +342,8 @@ elf_s390_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
default:
if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0]))
{
- (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
- abfd, (int) r_type);
+ _bfd_error_handler (_("%B: invalid relocation type %d"),
+ abfd, (int) r_type);
r_type = R_390_NONE;
}
cache_ptr->howto = &elf_howto_table[r_type];
@@ -1002,8 +1002,8 @@ elf_s390_check_relocs (bfd *abfd,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd, r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
return FALSE;
}
@@ -1231,7 +1231,7 @@ elf_s390_check_relocs (bfd *abfd,
{
if (old_tls_type == GOT_NORMAL || tls_type == GOT_NORMAL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' accessed both as normal and thread local symbol"),
abfd, h->root.root.string);
return FALSE;
@@ -2343,7 +2343,7 @@ invalid_tls_insn (bfd *input_bfd,
reloc_howto_type *howto;
howto = elf_howto_table + ELF32_R_TYPE (rel->r_info);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): invalid instruction for TLS relocation %s"),
input_bfd,
input_section,
@@ -3392,7 +3392,7 @@ elf_s390_relocate_section (bfd *output_bfd,
&& h->def_dynamic)
&& _bfd_elf_section_offset (output_bfd, info, input_section,
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,
@@ -3448,7 +3448,7 @@ elf_s390_relocate_section (bfd *output_bfd,
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): reloc against `%s': error %d"),
input_bfd, input_section,
(long) rel->r_offset, name, (int) r);
diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c
index 2e9dd9a..ec88a42 100644
--- a/bfd/elf32-score.c
+++ b/bfd/elf32-score.c
@@ -1515,7 +1515,7 @@ score_elf_create_local_got_entry (bfd *abfd,
{
(*loc)->gotidx = -1;
/* We didn't allocate enough space in the GOT. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("not enough GOT space for local GOT entries"));
bfd_set_error (bfd_error_bad_value);
return NULL;
@@ -2825,7 +2825,8 @@ s3_bfd_score_elf_check_relocs (bfd *abfd,
}
else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%s: Malformed reloc detected for section %s"), abfd, name);
+ _bfd_error_handler
+ (_("%s: Malformed reloc detected for section %s"), abfd, name);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -2881,7 +2882,7 @@ s3_bfd_score_elf_check_relocs (bfd *abfd,
case R_SCORE_CALL15:
if (h == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: CALL15 reloc at 0x%lx not against global symbol"),
abfd, (unsigned long) rel->r_offset);
bfd_set_error (bfd_error_bad_value);
@@ -4049,9 +4050,8 @@ s3_elf32_score_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
}
if (((in_flags & EF_SCORE_PIC) != 0) != ((out_flags & EF_SCORE_PIC) != 0))
- {
- (*_bfd_error_handler) (_("%B: warning: linking PIC files with non-PIC files"), ibfd);
- }
+ _bfd_error_handler
+ (_("%B: warning: linking PIC files with non-PIC files"), ibfd);
/* FIXME: Maybe dependency fix compatibility should be checked here. */
diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c
index d69cfdf..2c6da80 100644
--- a/bfd/elf32-score7.c
+++ b/bfd/elf32-score7.c
@@ -1376,7 +1376,7 @@ score_elf_create_local_got_entry (bfd *abfd,
{
(*loc)->gotidx = -1;
/* We didn't allocate enough space in the GOT. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("not enough GOT space for local GOT entries"));
bfd_set_error (bfd_error_bad_value);
return NULL;
@@ -2631,7 +2631,8 @@ s7_bfd_score_elf_check_relocs (bfd *abfd,
}
else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%s: Malformed reloc detected for section %s"), abfd, name);
+ _bfd_error_handler
+ (_("%s: Malformed reloc detected for section %s"), abfd, name);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -2687,7 +2688,7 @@ s7_bfd_score_elf_check_relocs (bfd *abfd,
case R_SCORE_CALL15:
if (h == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: CALL15 reloc at 0x%lx not against global symbol"),
abfd, (unsigned long) rel->r_offset);
bfd_set_error (bfd_error_bad_value);
@@ -3856,7 +3857,7 @@ s7_elf32_score_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (((in_flags & EF_SCORE_PIC) != 0) != ((out_flags & EF_SCORE_PIC) != 0))
{
- (*_bfd_error_handler) (_("%B: warning: linking PIC files with non-PIC files"), ibfd);
+ _bfd_error_handler (_("%B: warning: linking PIC files with non-PIC files"), ibfd);
}
/* Maybe dependency fix compatibility should be checked here. */
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 84c5b1e..d43ac54 100644
--- 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;
diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index 4e88de9..89a51cc 100644
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -227,8 +227,8 @@ sh64_elf_merge_private_data (bfd *ibfd, bfd *obfd)
else
msg = _("%s: object size does not match that of target %s");
- (*_bfd_error_handler) (msg, bfd_get_filename (ibfd),
- bfd_get_filename (obfd));
+ _bfd_error_handler (msg, bfd_get_filename (ibfd),
+ bfd_get_filename (obfd));
bfd_set_error (bfd_error_wrong_format);
return FALSE;
}
@@ -244,7 +244,7 @@ sh64_elf_merge_private_data (bfd *ibfd, bfd *obfd)
/* We don't allow linking in non-SH64 code. */
else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%s: uses non-SH64 instructions while previous modules use SH64 instructions",
bfd_get_filename (ibfd));
bfd_set_error (bfd_error_bad_value);
@@ -447,7 +447,7 @@ sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
&& h->root.type != bfd_link_hash_indirect))
{
/* Make sure we don't get confused on invalid input. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: encountered datalabel symbol in input"),
bfd_get_filename (abfd));
bfd_set_error (bfd_error_bad_value);
@@ -543,7 +543,7 @@ shmedia_prepare_reloc (struct bfd_link_info *info, bfd *abfd,
unknown destination (or when relaxing) will get us here. */
if ((insn & SHMEDIA_PTB_BIT) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: GAS error: unexpected PTB insn with R_SH_PT_16"),
bfd_get_filename (input_section->owner));
return FALSE;
@@ -592,7 +592,7 @@ shmedia_prepare_reloc (struct bfd_link_info *info, bfd *abfd,
}
if (dropped != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: error: unaligned relocation type %d at %08x reloc %p\n"),
input_section->owner, ELF32_R_TYPE (rel->r_info),
(unsigned) rel->r_offset, relocation);
@@ -668,7 +668,7 @@ sh64_elf_final_write_processing (bfd *abfd,
ld_generated_cranges_size))
{
bfd_set_error (bfd_error_file_truncated);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: could not write out added .cranges entries"),
bfd_get_filename (abfd));
}
@@ -728,7 +728,7 @@ sh64_elf_final_write_processing (bfd *abfd,
cranges_size))
{
bfd_set_error (bfd_error_file_truncated);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: could not write out sorted .cranges entries"),
bfd_get_filename (abfd));
}
diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c
index 0e0d90c..cbe20b5 100644
--- a/bfd/elf32-sparc.c
+++ b/bfd/elf32-sparc.c
@@ -84,7 +84,7 @@ elf32_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (bfd_mach_sparc_64bit_p (ibfd_mach))
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: compiled for a 64 bit system and target is 32 bit"), ibfd);
}
else if ((ibfd->flags & DYNAMIC) == 0)
@@ -97,7 +97,7 @@ elf32_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
!= previous_ibfd_e_flags)
&& previous_ibfd_e_flags != (unsigned long) -1)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking little endian files with big endian files"), ibfd);
error = TRUE;
}
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index e304b55..8e0d0c5 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -156,8 +156,8 @@ spu_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
/* PR 17512: file: 90c2a92e. */
if (r_type >= R_SPU_max)
{
- (*_bfd_error_handler) (_("%B: unrecognised SPU reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised SPU reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_SPU_NONE;
}
@@ -1014,9 +1014,9 @@ needs_ovl_stub (struct elf_link_hash_entry *h,
sym,
sym_sec);
}
- (*_bfd_error_handler) (_("warning: call to non-function"
- " symbol %s defined in %B"),
- sym_sec->owner, sym_name);
+ _bfd_error_handler
+ (_("warning: call to non-function symbol %s defined in %B"),
+ sym_sec->owner, sym_name);
}
}
@@ -1895,16 +1895,16 @@ define_ovtab_symbol (struct spu_link_hash_table *htab, const char *name)
}
else if (h->root.u.def.section->owner != NULL)
{
- (*_bfd_error_handler) (_("%B is not allowed to define %s"),
- h->root.u.def.section->owner,
- h->root.root.string);
+ _bfd_error_handler (_("%B is not allowed to define %s"),
+ h->root.u.def.section->owner,
+ h->root.root.string);
bfd_set_error (bfd_error_bad_value);
return NULL;
}
else
{
- (*_bfd_error_handler) (_("you are not allowed to define %s in a script"),
- h->root.root.string);
+ _bfd_error_handler (_("you are not allowed to define %s in a script"),
+ h->root.root.string);
bfd_set_error (bfd_error_bad_value);
return NULL;
}
@@ -1937,8 +1937,8 @@ spu_elf_build_stubs (struct bfd_link_info *info)
s = h->root.u.def.section->output_section;
if (spu_elf_section_data (s)->u.o.ovl_index)
{
- (*_bfd_error_handler) (_("%s in overlay section"),
- h->root.root.string);
+ _bfd_error_handler (_("%s in overlay section"),
+ h->root.root.string);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -1966,7 +1966,7 @@ spu_elf_build_stubs (struct bfd_link_info *info)
if (htab->stub_err)
{
- (*_bfd_error_handler) (_("overlay stub relocation overflow"));
+ _bfd_error_handler (_("overlay stub relocation overflow"));
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -1975,7 +1975,7 @@ spu_elf_build_stubs (struct bfd_link_info *info)
{
if (htab->stub_sec[i]->size != htab->stub_sec[i]->rawsize)
{
- (*_bfd_error_handler) (_("stubs don't match calculated size"));
+ _bfd_error_handler (_("stubs don't match calculated size"));
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -4793,7 +4793,7 @@ spu_elf_emit_fixup (bfd * output_bfd, struct bfd_link_info *info,
if (qaddr != (base & ~(bfd_vma) 15))
{
if ((sfixup->reloc_count + 1) * FIXUP_RECORD_SIZE > sfixup->size)
- (*_bfd_error_handler) (_("fatal error while creating .fixup"));
+ _bfd_error_handler (_("fatal error while creating .fixup"));
FIXUP_PUT (output_bfd, htab, sfixup->reloc_count, qaddr | bit);
sfixup->reloc_count++;
}
@@ -5026,7 +5026,7 @@ spu_elf_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
(_("%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"),
input_bfd,
bfd_get_section_name (input_bfd, input_section),
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 87c8bfe..c70b169 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -2521,9 +2521,9 @@ elf32_tic6x_relocate_section (bfd *output_bfd,
}
else
{
- (*_bfd_error_handler) (_("%B: SB-relative relocation but "
- "__c6xabi_DSBT_BASE not defined"),
- input_bfd);
+ _bfd_error_handler (_("%B: SB-relative relocation but "
+ "__c6xabi_DSBT_BASE not defined"),
+ input_bfd);
ok = FALSE;
continue;
}
@@ -2629,7 +2629,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd,
symbols. Make this an error; the compiler isn't
allowed to pass us these kinds of things. */
if (h == NULL)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against local symbol"),
input_bfd,
@@ -2637,7 +2637,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd,
elf32_tic6x_howto_table[r_type].name,
rel->r_addend);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against symbol `%s'"),
input_bfd,
@@ -2667,8 +2667,8 @@ elf32_tic6x_relocate_section (bfd *output_bfd,
/* Invalid in relocatable object. */
default:
/* Unknown relocation. */
- (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
- input_bfd, r_type);
+ _bfd_error_handler (_("%B: invalid relocation type %d"),
+ input_bfd, r_type);
ok = FALSE;
continue;
}
@@ -2806,9 +2806,8 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd,
- r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
return FALSE;
}
diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index dfb93ff..ae806fe 100644
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -1508,8 +1508,8 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd, r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
return FALSE;
}
@@ -1623,7 +1623,7 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
tls_type = old_tls_type;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' accessed both as normal and thread local symbol"),
abfd, h ? h->root.root.string : "<local>");
return FALSE;
@@ -2871,7 +2871,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
if ((unsigned int)r_type >= NELEMS(tilepro_elf_howto_table))
{
/* Not clear if we need to check here, but just be paranoid. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unrecognized relocation (0x%x) in section `%A'"),
input_bfd, r_type, input_section);
bfd_set_error (bfd_error_bad_value);
@@ -3320,7 +3320,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
if (indx == 0)
{
BFD_FAIL ();
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: probably compiled without -fPIC?"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
@@ -3571,7 +3571,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
&& h->def_dynamic)
&& _bfd_elf_section_offset (output_bfd, info, input_section,
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,
@@ -3921,7 +3921,7 @@ tilepro_elf_finish_dynamic_sections (bfd *output_bfd,
{
if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("discarded output section: `%A'"), htab->elf.sgotplt);
return FALSE;
}
diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index f80b187..8c12186 100644
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -464,7 +464,7 @@ v850_elf_perform_lo16_relocation (bfd *abfd, unsigned long *insn,
}
else
{
- (*_bfd_error_handler) (_("FAILED to find previous HI16 reloc"));
+ _bfd_error_handler (_("FAILED to find previous HI16 reloc"));
return FALSE;
}
}
@@ -2534,8 +2534,9 @@ v850_elf_merge_notes (bfd * ibfd, bfd *obfd)
case V850_NOTE_DATA_SIZE:
if (oval == EF_RH850_DOUBLE32)
{
- _bfd_error_handler (_("error: %B uses 64-bit doubles but %B uses 32-bit doubles"),
- ibfd, obfd);
+ _bfd_error_handler
+ (_("error: %B uses 64-bit doubles but "
+ "%B uses 32-bit doubles"), ibfd, obfd);
result = FALSE;
}
else
@@ -2547,8 +2548,9 @@ v850_elf_merge_notes (bfd * ibfd, bfd *obfd)
case V850_NOTE_FPU_INFO:
if (oval == EF_RH850_FPU20)
{
- _bfd_error_handler (_("error: %B uses FPU-3.0 but %B only supports FPU-2.0"),
- ibfd, obfd);
+ _bfd_error_handler
+ (_("error: %B uses FPU-3.0 but %B only supports FPU-2.0"),
+ ibfd, obfd);
result = FALSE;
}
else
@@ -2802,8 +2804,8 @@ v850_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
{
if ((in_flags & EF_V800_850E3) != (out_flags & EF_V800_850E3))
{
- _bfd_error_handler (_("%B: Architecture mismatch with previous modules"),
- ibfd);
+ _bfd_error_handler
+ (_("%B: Architecture mismatch with previous modules"), ibfd);
elf_elfheader (obfd)->e_flags |= EF_V800_850E3;
}
@@ -2858,8 +2860,8 @@ v850_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
return result;
}
- _bfd_error_handler (_("%B: Architecture mismatch with previous modules"),
- ibfd);
+ _bfd_error_handler
+ (_("%B: Architecture mismatch with previous modules"), ibfd);
}
return result;
@@ -3590,19 +3592,21 @@ v850_elf_relax_section (bfd *abfd,
}
else
{
- ((*_bfd_error_handler)
- ("%s: 0x%lx: warning: R_V850_LONGCALL points to unrecognized insns",
- bfd_get_filename (abfd), (unsigned long) irel->r_offset));
-
+ _bfd_error_handler
+ ("%s: 0x%lx: warning: R_V850_LONGCALL points to "
+ "unrecognized insns",
+ bfd_get_filename (abfd), (unsigned long) irel->r_offset);
continue;
}
if (no_match >= 0)
{
- ((*_bfd_error_handler)
- ("%s: 0x%lx: warning: R_V850_LONGCALL points to unrecognized insn 0x%x",
- bfd_get_filename (abfd), (unsigned long) irel->r_offset+no_match, insn[no_match]));
-
+ _bfd_error_handler
+ ("%s: 0x%lx: warning: R_V850_LONGCALL points to "
+ "unrecognized insn 0x%x",
+ bfd_get_filename (abfd),
+ (unsigned long) irel->r_offset + no_match,
+ insn[no_match]);
continue;
}
@@ -3641,9 +3645,10 @@ v850_elf_relax_section (bfd *abfd,
|| lo_irelfn == irelend
|| irelcall == irelend)
{
- ((*_bfd_error_handler)
- ("%s: 0x%lx: warning: R_V850_LONGCALL points to unrecognized reloc",
- bfd_get_filename (abfd), (unsigned long) irel->r_offset ));
+ _bfd_error_handler
+ ("%s: 0x%lx: warning: R_V850_LONGCALL points to "
+ "unrecognized reloc",
+ bfd_get_filename (abfd), (unsigned long) irel->r_offset);
continue;
}
@@ -3679,10 +3684,11 @@ v850_elf_relax_section (bfd *abfd,
if (symval + irelcall->r_addend != irelcall->r_offset + 4)
{
- ((*_bfd_error_handler)
- ("%s: 0x%lx: warning: R_V850_LONGCALL points to unrecognized reloc 0x%lx",
- bfd_get_filename (abfd), (unsigned long) irel->r_offset, irelcall->r_offset ));
-
+ _bfd_error_handler
+ ("%s: 0x%lx: warning: R_V850_LONGCALL points to "
+ "unrecognized reloc 0x%lx",
+ bfd_get_filename (abfd), (unsigned long) irel->r_offset,
+ irelcall->r_offset);
continue;
}
@@ -3820,19 +3826,21 @@ v850_elf_relax_section (bfd *abfd,
}
else
{
- ((*_bfd_error_handler)
- ("%s: 0x%lx: warning: R_V850_LONGJUMP points to unrecognized insns",
- bfd_get_filename (abfd), (unsigned long) irel->r_offset));
-
+ _bfd_error_handler
+ ("%s: 0x%lx: warning: R_V850_LONGJUMP points to "
+ "unrecognized insns",
+ bfd_get_filename (abfd), (unsigned long) irel->r_offset);
continue;
}
if (no_match >= 0)
{
- ((*_bfd_error_handler)
- ("%s: 0x%lx: warning: R_V850_LONGJUMP points to unrecognized insn 0x%x",
- bfd_get_filename (abfd), (unsigned long) irel->r_offset+no_match, insn[no_match]));
-
+ _bfd_error_handler
+ ("%s: 0x%lx: warning: R_V850_LONGJUMP points to "
+ "unrecognized insn 0x%x",
+ bfd_get_filename (abfd),
+ (unsigned long) irel->r_offset + no_match,
+ insn[no_match]);
continue;
}
@@ -3860,10 +3868,10 @@ v850_elf_relax_section (bfd *abfd,
if ( hi_irelfn == irelend
|| lo_irelfn == irelend)
{
- ((*_bfd_error_handler)
- ("%s: 0x%lx: warning: R_V850_LONGJUMP points to unrecognized reloc",
- bfd_get_filename (abfd), (unsigned long) irel->r_offset ));
-
+ _bfd_error_handler
+ ("%s: 0x%lx: warning: R_V850_LONGJUMP points to "
+ "unrecognized reloc",
+ bfd_get_filename (abfd), (unsigned long) irel->r_offset);
continue;
}
diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c
index 41c52f1..a1cd1a1 100644
--- a/bfd/elf32-vax.c
+++ b/bfd/elf32-vax.c
@@ -287,8 +287,8 @@ rtype_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
r_type = ELF32_R_TYPE (dst->r_info);
if (r_type >= R_VAX_max)
{
- (*_bfd_error_handler) (_("%B: unrecognised VAX reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised VAX reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_VAX_NONE;
}
@@ -658,7 +658,7 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
{
h->got.refcount++;
if (eh->got_addend != (bfd_vma) rel->r_addend)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: GOT addend of %ld to `%s' does"
" not match previous GOT addend of %ld"),
bfd_get_filename (abfd), rel->r_addend,
@@ -1545,7 +1545,7 @@ elf_vax_relocate_section (bfd *output_bfd,
h->plt.offset |= 1;
}
else if (rel->r_addend != 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: PLT addend of %d to `%s' from %s section ignored"),
bfd_get_filename (input_bfd), rel->r_addend,
h->root.root.string,
@@ -1670,13 +1670,13 @@ elf_vax_relocate_section (bfd *output_bfd,
&& ELF32_R_TYPE (outrel.r_info) != R_VAX_GLOB_DAT))
{
if (h != NULL)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: %s relocation against symbol `%s' from %s section"),
bfd_get_filename (input_bfd), howto->name,
h->root.root.string,
bfd_get_section_name (input_bfd, input_section));
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: %s relocation to 0x%x from %s section"),
bfd_get_filename (input_bfd), howto->name,
outrel.r_addend,
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 41506f4..a27f43e 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -912,8 +912,8 @@ xtensa_read_table_entries (bfd *abfd,
if (blocks[blk - 1].address == blocks[blk].address &&
blocks[blk - 1].size != 0)
{
- (*_bfd_error_handler) (_("%B(%A): invalid property table"),
- abfd, section);
+ _bfd_error_handler (_("%B(%A): invalid property table"),
+ abfd, section);
bfd_set_error (bfd_error_bad_value);
free (blocks);
return -1;
@@ -1003,8 +1003,8 @@ elf_xtensa_check_relocs (bfd *abfd,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd, r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
return FALSE;
}
@@ -1179,7 +1179,7 @@ elf_xtensa_check_relocs (bfd *abfd,
tls_type |= old_tls_type;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' accessed both as normal and thread local symbol"),
abfd,
h ? h->root.root.string : "<local>");
@@ -2777,7 +2777,7 @@ elf_xtensa_relocate_section (bfd *output_bfd,
if (rel->r_offset >= input_size
&& ELF32_R_TYPE (rel->r_info) != R_XTENSA_NONE)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): relocation offset out of range (size=0x%x)"),
input_bfd, input_section, rel->r_offset, input_size);
bfd_set_error (bfd_error_bad_value);
@@ -2801,7 +2801,7 @@ elf_xtensa_relocate_section (bfd *output_bfd,
|| h->root.type == bfd_link_hash_defweak)
&& IS_XTENSA_TLS_RELOC (r_type) != (sym_type == STT_TLS))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((sym_type == STT_TLS
? _("%B(%A+0x%lx): %s used with TLS symbol %s")
: _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
@@ -3058,7 +3058,7 @@ elf_xtensa_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
(_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
input_bfd,
input_section,
@@ -3162,7 +3162,7 @@ elf_xtensa_combine_prop_entries (bfd *output_bfd,
sgotloc_size = sgotloc->size;
if (sgotloc_size != section_size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("internal inconsistency in size of .got.loc section"));
return -1;
}
@@ -3478,7 +3478,7 @@ elf_xtensa_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
in_mach = in_flag & EF_XTENSA_MACH;
if (out_mach != in_mach)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: incompatible machine type. Output is 0x%x. Input is 0x%x"),
ibfd, out_mach, in_mach);
bfd_set_error (bfd_error_wrong_format);
@@ -6544,7 +6544,7 @@ extend_ebb_bounds_forward (ebb_t *ebb)
entry_end - ebb->end_offset);
if (insn_block_len != (entry_end - ebb->end_offset))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
ebb->sec->owner, ebb->sec, ebb->end_offset + insn_block_len);
return FALSE;
@@ -6620,7 +6620,7 @@ extend_ebb_bounds_backward (ebb_t *ebb)
ebb->start_offset - block_begin);
if (insn_block_len != ebb->start_offset - block_begin)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
ebb->sec->owner, ebb->sec, ebb->end_offset + insn_block_len);
return FALSE;
@@ -7733,7 +7733,7 @@ compute_text_actions (bfd *abfd,
simplify_size = get_asm_simplify_size (contents, sec_size, r_offset);
if (simplify_size == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): could not decode instruction for XTENSA_ASM_SIMPLIFY relocation; possible configuration mismatch"),
sec->owner, sec, r_offset);
continue;
@@ -7991,7 +7991,7 @@ compute_ebb_proposed_actions (ebb_constraint *ebb_table)
return TRUE;
decode_error:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
ebb->sec->owner, ebb->sec, offset);
return FALSE;
@@ -10767,7 +10767,7 @@ do_fix_for_relocatable_link (Elf_Internal_Rela *rel,
{
if (r_type != R_XTENSA_ASM_EXPAND)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): unexpected fix for %s relocation"),
input_bfd, input_section, rel->r_offset,
elf_howto_table[r_type].name);
diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index 5a9c3c7..f66eac4 100644
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -1108,8 +1108,8 @@ elf64_alpha_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
if (r_type >= R_ALPHA_max)
{
- (*_bfd_error_handler) (_("%B: unrecognised Alpha reloc number: %d"),
- abfd, r_type);
+ _bfd_error_handler (_("%B: unrecognised Alpha reloc number: %d"),
+ abfd, r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_ALPHA_NONE;
}
@@ -2519,7 +2519,7 @@ elf64_alpha_size_got_sections (struct bfd_link_info *info,
if (alpha_elf_tdata (this_got)->total_got_size > MAX_GOT_SIZE)
{
/* Yikes! A single object file has too many entries. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: .got subsegment exceeds 64K (size %d)"),
i, alpha_elf_tdata (this_got)->total_got_size);
return FALSE;
@@ -3071,10 +3071,10 @@ elf64_alpha_relax_got_load (struct alpha_relax_info *info, bfd_vma symval,
if (insn >> 26 != OP_LDQ)
{
reloc_howto_type *howto = elf64_alpha_howto_table + r_type;
- ((*_bfd_error_handler)
- ("%B: %A+0x%lx: warning: %s relocation against unexpected insn",
- info->abfd, info->sec,
- (unsigned long) irel->r_offset, howto->name));
+ _bfd_error_handler
+ ("%B: %A+0x%lx: warning: %s relocation against unexpected insn",
+ info->abfd, info->sec,
+ (unsigned long) irel->r_offset, howto->name);
return TRUE;
}
@@ -3264,10 +3264,10 @@ elf64_alpha_relax_with_lituse (struct alpha_relax_info *info,
lit_insn = bfd_get_32 (abfd, contents + irel->r_offset);
if (lit_insn >> 26 != OP_LDQ)
{
- ((*_bfd_error_handler)
- ("%B: %A+0x%lx: warning: LITERAL relocation against unexpected insn",
- abfd, info->sec,
- (unsigned long) irel->r_offset));
+ _bfd_error_handler
+ ("%B: %A+0x%lx: warning: LITERAL relocation against unexpected insn",
+ abfd, info->sec,
+ (unsigned long) irel->r_offset);
return TRUE;
}
@@ -4150,7 +4150,7 @@ elf64_alpha_relocate_section_r (bfd *output_bfd ATTRIBUTE_UNUSED,
r_type = ELF64_R_TYPE (rel->r_info);
if (r_type >= R_ALPHA_max)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unknown relocation type %d"),
input_bfd, (int) r_type);
bfd_set_error (bfd_error_bad_value);
@@ -4300,7 +4300,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
r_type = ELF64_R_TYPE(rel->r_info);
if (r_type >= R_ALPHA_max)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unknown relocation type %d"),
input_bfd, (int) r_type);
bfd_set_error (bfd_error_bad_value);
@@ -4465,7 +4465,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
case R_ALPHA_GPRELLOW:
if (dynamic_symbol_p)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: gp-relative relocation against dynamic symbol %s"),
input_bfd, h->root.root.root.string);
ret_val = FALSE;
@@ -4477,7 +4477,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
case R_ALPHA_GPRELHIGH:
if (dynamic_symbol_p)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: gp-relative relocation against dynamic symbol %s"),
input_bfd, h->root.root.root.string);
ret_val = FALSE;
@@ -4503,7 +4503,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
case R_ALPHA_BRADDR:
if (dynamic_symbol_p)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: pc-relative relocation against dynamic symbol %s"),
input_bfd, h->root.root.root.string);
ret_val = FALSE;
@@ -4531,7 +4531,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
&& alpha_elf_tdata (sec->owner)->gotobj
&& gotobj != alpha_elf_tdata (sec->owner)->gotobj)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: change in gp: BRSGP %s"),
input_bfd, h->root.root.root.string);
ret_val = FALSE;
@@ -4561,7 +4561,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
else if (name[0] == 0)
name = bfd_section_name (input_bfd, sec);
}
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: !samegp reloc against symbol without .prologue: %s"),
input_bfd, name);
ret_val = FALSE;
@@ -4618,7 +4618,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
{
if (r_type == R_ALPHA_REFLONG)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unhandled dynamic relocation against %s"),
input_bfd,
h->root.root.root.string);
@@ -4643,7 +4643,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
case R_ALPHA_SREL64:
if (dynamic_symbol_p)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: pc-relative relocation against dynamic symbol %s"),
input_bfd, h->root.root.root.string);
ret_val = FALSE;
@@ -4651,7 +4651,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
else if (bfd_link_pic (info)
&& undef_weak_ref)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: pc-relative relocation against undefined weak symbol %s"),
input_bfd, h->root.root.root.string);
ret_val = FALSE;
@@ -4716,7 +4716,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
case R_ALPHA_DTPREL16:
if (dynamic_symbol_p)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: dtp-relative relocation against dynamic symbol %s"),
input_bfd, h->root.root.root.string);
ret_val = FALSE;
@@ -4732,14 +4732,14 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
case R_ALPHA_TPREL16:
if (bfd_link_dll (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: TLS local exec code cannot be linked into shared objects"),
input_bfd);
ret_val = FALSE;
}
else if (dynamic_symbol_p)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: tp-relative relocation against dynamic symbol %s"),
input_bfd, h->root.root.root.string);
ret_val = FALSE;
diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c
index fca40e1..f0df607 100644
--- a/bfd/elf64-hppa.c
+++ b/bfd/elf64-hppa.c
@@ -2077,9 +2077,9 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
if ((value & 7) || value + max_offset >= 2*max_offset - 8)
{
- (*_bfd_error_handler) (_("stub entry for %s cannot load .plt, dp offset = %ld"),
- hh->eh.root.root.string,
- (long) value);
+ _bfd_error_handler
+ (_("stub entry for %s cannot load .plt, dp offset = %ld"),
+ hh->eh.root.root.string, (long) value);
return FALSE;
}
@@ -3281,7 +3281,7 @@ elf_hppa_final_link_relocate (Elf_Internal_Rela *rel,
if (max_branch_offset != 0
&& value + addend + max_branch_offset >= 2*max_branch_offset)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%" BFD_VMA_FMT "x): cannot reach %s"),
input_bfd,
input_section,
diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
index 56c1103..6f6d5e3 100644
--- a/bfd/elf64-ia64-vms.c
+++ b/bfd/elf64-ia64-vms.c
@@ -582,7 +582,7 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec,
if (strcmp (sec->output_section->name, ".init") == 0
|| strcmp (sec->output_section->name, ".fini") == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."),
sec->owner, sec, (unsigned long) roff);
bfd_set_error (bfd_error_bad_value);
@@ -3275,7 +3275,7 @@ elf64_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final)
if (max_short_vma - min_short_vma >= 0x400000)
{
overflow:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: short data segment overflowed (0x%lx >= 0x400000)"),
bfd_get_filename (abfd),
(unsigned long) (max_short_vma - min_short_vma));
@@ -3286,7 +3286,7 @@ overflow:
|| (gp_val < max_short_vma
&& max_short_vma - gp_val >= 0x200000))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: __gp does not cover short data segment"),
bfd_get_filename (abfd));
return FALSE;
@@ -3425,7 +3425,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
r_type = ELF64_R_TYPE (rel->r_info);
if (r_type > R_IA64_MAX_RELOC_CODE)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unknown relocation type %d"),
input_bfd, (int) r_type);
bfd_set_error (bfd_error_bad_value);
@@ -3551,7 +3551,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
case R_IA64_IMM64:
/* ??? People shouldn't be doing non-pic code in
shared libraries nor dynamic executables. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: non-pic code with imm relocation against dynamic symbol `%s'"),
input_bfd,
h ? h->root.root.string
@@ -3613,7 +3613,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
case R_IA64_GPREL64LSB:
if (dynamic_symbol_p)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: @gprel relocation against dynamic symbol %s"),
input_bfd,
h ? h->root.root.string
@@ -3672,7 +3672,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
dynamic symbol table. */
/* ??? People shouldn't be doing non-pic code in
shared libraries. Hork. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking non-pic code in a position independent executable"),
input_bfd);
ret_val = FALSE;
@@ -3779,12 +3779,12 @@ elf64_ia64_relocate_section (bfd *output_bfd,
msg = _("%B: speculation fixup to dynamic symbol %s");
else
msg = _("%B: @pcrel relocation against dynamic symbol %s");
- (*_bfd_error_handler) (msg, input_bfd,
- h ? h->root.root.string
- : bfd_elf_sym_name (input_bfd,
- symtab_hdr,
- sym,
- sym_sec));
+ _bfd_error_handler (msg, input_bfd,
+ h ? h->root.root.string
+ : bfd_elf_sym_name (input_bfd,
+ symtab_hdr,
+ sym,
+ sym_sec));
ret_val = FALSE;
continue;
}
@@ -3937,7 +3937,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
case R_IA64_LTOFF_TPREL22:
case R_IA64_LTOFF_DTPMOD22:
case R_IA64_LTOFF_DTPREL22:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."),
input_bfd, input_section, howto->name, name,
rel->r_offset);
@@ -3952,7 +3952,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
/* Relaxtion is always performed for ELF output.
Overflow failures for those relocations mean
that the section is too big to relax. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."),
input_bfd, input_section, howto->name, name,
rel->r_offset, input_section->size);
@@ -4240,7 +4240,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if ((in_flags & EF_IA_64_TRAPNIL) != (out_flags & EF_IA_64_TRAPNIL))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking trap-on-NULL-dereference with non-trapping files"),
ibfd);
@@ -4249,7 +4249,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
}
if ((in_flags & EF_IA_64_BE) != (out_flags & EF_IA_64_BE))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking big-endian files with little-endian files"),
ibfd);
@@ -4258,7 +4258,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
}
if ((in_flags & EF_IA_64_ABI64) != (out_flags & EF_IA_64_ABI64))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking 64-bit files with 32-bit files"),
ibfd);
@@ -4267,7 +4267,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
}
if ((in_flags & EF_IA_64_CONS_GP) != (out_flags & EF_IA_64_CONS_GP))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking constant-gp files with non-constant-gp files"),
ibfd);
@@ -4277,7 +4277,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if ((in_flags & EF_IA_64_NOFUNCDESC_CONS_GP)
!= (out_flags & EF_IA_64_NOFUNCDESC_CONS_GP))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking auto-pic files with non-auto-pic files"),
ibfd);
@@ -5119,13 +5119,13 @@ error_free_dyn:
{
/* PR binutils/2735 */
if (normal_bfd == NULL)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: alignment %u of common symbol `%s' in %B"
" is greater than the alignment (%u) of its section %A"),
common_bfd, h->root.u.def.section,
1 << common_align, name, 1 << normal_align);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: alignment %u of symbol `%s' in %B"
" is smaller than %u in %B"),
normal_bfd, common_bfd,
@@ -5140,7 +5140,7 @@ error_free_dyn:
if (h->size != 0
&& h->size != isym->st_size
&& ! size_change_ok)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: size of symbol `%s' changed"
" from %lu in %B to %lu in %B"),
old_bfd, abfd,
@@ -5167,7 +5167,7 @@ error_free_dyn:
if (h->type != type)
{
if (h->type != STT_NOTYPE && ! type_change_ok)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: type of symbol `%s' changed"
" from %d to %d in %B"),
abfd, name, h->type, type);
diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index f04c4b5..8cd0a73 100644
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -3618,7 +3618,7 @@ mips_elf64_rtype_to_howto (unsigned int r_type, bfd_boolean rela_p)
}
if (r_type >= R_MIPS_max)
{
- (*_bfd_error_handler) (_("unrecognised MIPS reloc number: %d"), r_type);
+ _bfd_error_handler (_("unrecognised MIPS reloc number: %d"), r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_MIPS_NONE;
}
diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
index 9c56f7c..406e683 100644
--- a/bfd/elf64-mmix.c
+++ b/bfd/elf64-mmix.c
@@ -1190,7 +1190,7 @@ 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
(_("%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),
@@ -1611,12 +1611,12 @@ 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
(_("%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
(_("%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));
@@ -1660,12 +1660,12 @@ 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
(_("%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
(_("%s: register relocation against non-register symbol: %s in %s"),
bfd_get_filename (input_section->owner), symname,
bfd_get_section_name (symsec->owner, symsec));
@@ -1702,7 +1702,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));
@@ -1732,7 +1732,7 @@ 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
(_("%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);
@@ -2189,10 +2189,11 @@ 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
+ (_("%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;
}
@@ -2432,7 +2433,7 @@ _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
(_("Internal inconsistency: remaining %u != max %u.\n\
Please report this bug."),
gregdata->n_remaining_bpo_relocs_this_relaxation_round,
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index d6acc1f3..2a9ea1e 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -2490,8 +2490,8 @@ ppc64_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
type = ELF64_R_TYPE (dst->r_info);
if (type >= ARRAY_SIZE (ppc64_elf_howto_table))
{
- (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
- abfd, (int) type);
+ _bfd_error_handler (_("%B: invalid relocation type %d"),
+ abfd, (int) type);
type = R_PPC64_NONE;
}
cache_ptr->howto = ppc64_elf_howto_table[type];
@@ -6016,14 +6016,14 @@ ppc64_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (iflags & ~EF_PPC64_ABI)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B uses unknown e_flags 0x%lx"), ibfd, iflags);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
else if (iflags != oflags && iflags != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: ABI version %ld is not compatible with ABI version %ld output"),
ibfd, iflags, oflags);
bfd_set_error (bfd_error_bad_value);
@@ -7599,7 +7599,7 @@ tocsave_find (struct ppc_link_hash_table *htab,
return NULL;
if (ent.sec == NULL || ent.sec->output_section == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: undefined symbol on R_PPC64_TOCSAVE relocation"));
return NULL;
}
@@ -7917,7 +7917,7 @@ ppc64_elf_edit_opd (struct bfd_link_info *info)
something silly in .opd with the assembler. No .opd
optimization for them! */
broken_opd:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: .opd is not a regular array of opd entries"), ibfd);
broken = TRUE;
break;
@@ -7926,7 +7926,7 @@ ppc64_elf_edit_opd (struct bfd_link_info *info)
if ((r_type = ELF64_R_TYPE (rel->r_info)) != R_PPC64_ADDR64
|| (r_type = ELF64_R_TYPE ((rel + 1)->r_info)) != R_PPC64_TOC)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unexpected reloc type %u in .opd section"),
ibfd, r_type);
broken = TRUE;
@@ -7947,7 +7947,7 @@ ppc64_elf_edit_opd (struct bfd_link_info *info)
sym_name = bfd_elf_sym_name (ibfd, symtab_hdr, sym,
sym_sec);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: undefined sym `%s' in .opd section"),
ibfd, sym_name);
broken = TRUE;
@@ -8851,7 +8851,7 @@ adjust_toc_syms (struct elf_link_hash_entry *h, void *inf)
if ((toc_inf->skip[i] & (ref_from_discarded | can_optimize)) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s defined on removed toc entry"), eh->elf.root.root.string);
do
++i;
@@ -9475,7 +9475,7 @@ ppc64_elf_edit_toc (struct bfd_link_info *info)
if ((skip[i] & (ref_from_discarded | can_optimize)) != 0)
{
if (local_toc_syms)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s defined on removed toc entry"),
bfd_elf_sym_name (ibfd, symtab_hdr, sym, NULL));
do
@@ -12104,8 +12104,8 @@ group_sections (struct bfd_link_info *info,
big_sec = total > group_size;
if (big_sec && !suppress_size_errors)
- (*_bfd_error_handler) (_("%B section %A exceeds stub group size"),
- tail->owner, tail);
+ _bfd_error_handler (_("%B section %A exceeds stub group size"),
+ tail->owner, tail);
curr_toc = htab->sec_info[tail->id].toc_off;
while ((prev = htab->sec_info[curr->id].u.list) != NULL
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index fc7a337..431d06c 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -368,8 +368,8 @@ elf_s390_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
default:
if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0]))
{
- (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
- abfd, (int) r_type);
+ _bfd_error_handler (_("%B: invalid relocation type %d"),
+ abfd, (int) r_type);
r_type = R_390_NONE;
}
cache_ptr->howto = &elf_howto_table[r_type];
@@ -924,9 +924,8 @@ elf_s390_check_relocs (bfd *abfd,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd,
- r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
return FALSE;
}
@@ -1164,7 +1163,7 @@ elf_s390_check_relocs (bfd *abfd,
{
if (old_tls_type == GOT_NORMAL || tls_type == GOT_NORMAL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' accessed both as normal and thread local symbol"),
abfd, h->root.root.string);
return FALSE;
@@ -2294,7 +2293,7 @@ invalid_tls_insn (bfd *input_bfd,
reloc_howto_type *howto;
howto = elf_howto_table + ELF64_R_TYPE (rel->r_info);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): invalid instruction for TLS relocation %s"),
input_bfd,
input_section,
@@ -3307,7 +3306,7 @@ elf_s390_relocate_section (bfd *output_bfd,
&& h->def_dynamic)
&& _bfd_elf_section_offset (output_bfd, info, input_section,
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,
@@ -3363,7 +3362,7 @@ elf_s390_relocate_section (bfd *output_bfd,
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): reloc against `%s': error %d"),
input_bfd, input_section,
(long) rel->r_offset, name, (int) r);
diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index d963219..ac82af2 100644
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1539,7 +1539,7 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
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);
@@ -1635,7 +1635,7 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
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,
@@ -1678,7 +1678,7 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
}
if (dropped != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: error: unaligned relocation type %d at %08x reloc %08x\n"),
bfd_get_filename (input_bfd), (int)r_type, (unsigned)rel->r_offset, (unsigned)relocation);
bfd_set_error (bfd_error_bad_value);
@@ -2295,8 +2295,8 @@ sh_elf64_merge_private_data (bfd *ibfd, bfd *obfd)
else
msg = _("%s: object size does not match that of target %s");
- (*_bfd_error_handler) (msg, bfd_get_filename (ibfd),
- bfd_get_filename (obfd));
+ _bfd_error_handler (msg, bfd_get_filename (ibfd),
+ bfd_get_filename (obfd));
bfd_set_error (bfd_error_wrong_format);
return FALSE;
}
@@ -2314,7 +2314,7 @@ sh_elf64_merge_private_data (bfd *ibfd, bfd *obfd)
here as things change. */
else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%s: does not use the SH64 64-bit ABI as previous modules do",
bfd_get_filename (ibfd));
bfd_set_error (bfd_error_bad_value);
@@ -2808,7 +2808,7 @@ sh64_elf64_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
&& h->root.type != bfd_link_hash_indirect))
{
/* Make sure we don't get confused on invalid input. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: encountered datalabel symbol in input"),
bfd_get_filename (abfd));
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
index c700b7e..263fef7 100644
--- a/bfd/elf64-sparc.c
+++ b/bfd/elf64-sparc.c
@@ -442,7 +442,7 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
case 2: reg -= 2; break;
case 6: reg -= 4; break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Only registers %%g[2367] can be declared using STT_REGISTER"),
abfd);
return FALSE;
@@ -462,7 +462,7 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
if (p->name != NULL && strcmp (p->name, *namep))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Register %%g%d used incompatibly: %s in %B, previously %s in %B"),
abfd, p->abfd, (int) sym->st_value,
**namep ? *namep : "#scratch",
@@ -485,7 +485,7 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
if (type > STT_FUNC)
type = 0;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"),
abfd, p->abfd, *namep, stt_types[type]);
return FALSE;
@@ -530,7 +530,7 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
if (type > STT_FUNC)
type = 0;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"),
abfd, p->abfd, *namep, stt_types[type]);
return FALSE;
@@ -683,7 +683,7 @@ elf64_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
&& (old_flags & EF_SPARC_HAL_R1))
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking UltraSPARC specific with HAL specific code"),
ibfd);
}
@@ -702,7 +702,7 @@ elf64_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (new_flags != old_flags)
{
error = TRUE;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
ibfd, (long) new_flags, (long) old_flags);
}
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 9a6a5c7..3cb5c80 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -285,8 +285,8 @@ elf_x86_64_rtype_to_howto (bfd *abfd, unsigned r_type)
{
if (r_type >= (unsigned int) R_X86_64_standard)
{
- (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
- abfd, (int) r_type);
+ _bfd_error_handler (_("%B: invalid relocation type %d"),
+ abfd, (int) r_type);
r_type = R_X86_64_NONE;
}
i = r_type;
@@ -1653,7 +1653,7 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
}
}
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: TLS transition from %s to %s against `%s' at 0x%lx "
"in section `%A' failed"),
abfd, sec, from->name, to->name, name,
@@ -1712,9 +1712,9 @@ elf_x86_64_need_pic (bfd *input_bfd, asection *sec,
pic = _("; recompile with -fPIC");
}
- (*_bfd_error_handler) (_("%B: relocation %s against %s%s`%s' can "
- "not be used when making a shared object%s"),
- input_bfd, howto->name, und, v, name, pic);
+ _bfd_error_handler (_("%B: relocation %s against %s%s`%s' can "
+ "not be used when making a shared object%s"),
+ input_bfd, howto->name, und, v, name, pic);
bfd_set_error (bfd_error_bad_value);
sec->check_relocs_failed = 1;
return FALSE;
@@ -2204,8 +2204,8 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd, r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
goto error_return;
}
@@ -2266,7 +2266,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
else
name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against symbol `%s' isn't "
"supported in x32 mode"), abfd,
x86_64_elf_howto_table[r_type].name, name);
@@ -2454,7 +2454,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
else
name = bfd_elf_sym_name (abfd, symtab_hdr,
isym, NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: '%s' accessed both as normal and thread local symbol"),
abfd, name);
bfd_set_error (bfd_error_bad_value);
@@ -4144,7 +4144,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
if (r_type >= (int) R_X86_64_standard)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unrecognized relocation (0x%x) in section `%A'"),
input_bfd, input_section, r_type);
bfd_set_error (bfd_error_bad_value);
@@ -4371,7 +4371,7 @@ bad_ifunc_reloc:
else
name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against STT_GNU_IFUNC "
"symbol `%s' isn't supported"), input_bfd,
howto->name, name);
@@ -4396,7 +4396,7 @@ do_ifunc_pointer:
else
name = bfd_elf_sym_name (input_bfd, symtab_hdr,
sym, NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against STT_GNU_IFUNC "
"symbol `%s' has non-zero addend: %d"),
input_bfd, howto->name, name, rel->r_addend);
@@ -4631,7 +4631,7 @@ do_ifunc_pointer:
break;
}
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation R_X86_64_GOTOFF64 against undefined %s `%s' can not be used when making a shared object"),
input_bfd, v, h->root.root.string);
bfd_set_error (bfd_error_bad_value);
@@ -4643,7 +4643,7 @@ do_ifunc_pointer:
|| h->type == STT_OBJECT)
&& ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used when making a shared object"),
input_bfd,
h->type == STT_FUNC ? "function" : "data",
@@ -4910,7 +4910,7 @@ direct:
name = bfd_elf_sym_name (input_bfd, symtab_hdr,
sym, NULL);
if (addend < 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: addend -0x%x in relocation %s against "
"symbol `%s' at 0x%lx in section `%A' is "
"out of range"),
@@ -4918,7 +4918,7 @@ direct:
howto->name, name,
(unsigned long) rel->r_offset);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: addend 0x%x in relocation %s against "
"symbol `%s' at 0x%lx in section `%A' is "
"out of range"),
@@ -5541,7 +5541,7 @@ direct:
&& _bfd_elf_section_offset (output_bfd, info, input_section,
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,
@@ -5580,7 +5580,7 @@ check_relocation_error:
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): reloc against `%s': error %d"),
input_bfd, input_section,
(long) rel->r_offset, name, (int) r);
@@ -6288,7 +6288,7 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
{
if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("discarded output section: `%A'"), htab->elf.sgotplt);
return FALSE;
}
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 79a14f3..0f3ccf2 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1185,7 +1185,7 @@ elf_slurp_symbol_table (bfd *abfd, asymbol **symptrs, bfd_boolean dynamic)
if (verhdr != NULL
&& verhdr->sh_size / sizeof (Elf_External_Versym) != symcount)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: version count (%ld) does not match symbol count (%ld)"),
abfd->filename,
(long) (verhdr->sh_size / sizeof (Elf_External_Versym)),
@@ -1439,7 +1439,7 @@ elf_slurp_reloc_table_from_section (bfd *abfd,
relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
else if (ELF_R_SYM (rela.r_info) > symcount)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s(%s): relocation %d has invalid symbol index %ld"),
abfd->filename, asect->name, i, ELF_R_SYM (rela.r_info));
relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
diff --git a/bfd/elfcore.h b/bfd/elfcore.h
index de200f9..9f873b7 100644
--- a/bfd/elfcore.h
+++ b/bfd/elfcore.h
@@ -295,7 +295,7 @@ elf_core_file_p (bfd *abfd)
{
if ((bfd_size_type) statbuf.st_size < high)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: %B is truncated: expected core file "
"size >= %lu, found: %lu."),
abfd, (unsigned long) high, (unsigned long) statbuf.st_size);
diff --git a/bfd/elflink.c b/bfd/elflink.c
index fbf8c00..d7207ff 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1259,22 +1259,22 @@ _bfd_elf_merge_symbol (bfd *abfd,
}
if (tdef && ntdef)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: TLS definition in %B section %A "
"mismatches non-TLS definition in %B section %A"),
tbfd, tsec, ntbfd, ntsec, h->root.root.string);
else if (!tdef && !ntdef)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: TLS reference in %B "
"mismatches non-TLS reference in %B"),
tbfd, ntbfd, h->root.root.string);
else if (tdef)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: TLS definition in %B section %A "
"mismatches non-TLS reference in %B"),
tbfd, tsec, ntbfd, h->root.root.string);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: TLS reference in %B "
"mismatches non-TLS definition in %B section %A"),
tbfd, ntbfd, ntsec, h->root.root.string);
@@ -1937,7 +1937,7 @@ nondefault:
overridden by a versioned definition. */
if (hi->root.type != bfd_link_hash_defined
&& hi->root.type != bfd_link_hash_defweak)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unexpected redefinition of indirect versioned symbol `%s'"),
abfd, shortname);
}
@@ -2229,7 +2229,7 @@ _bfd_elf_link_assign_sym_version (struct elf_link_hash_entry *h, void *data)
{
/* We could not find the version for a symbol when
generating a shared archive. Return an error. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: version node not found for symbol %s"),
info->output_bfd, h->root.root.string);
bfd_set_error (bfd_error_bad_value);
@@ -2317,7 +2317,7 @@ elf_link_read_relocs_from_section (bfd *abfd,
{
if ((size_t) r_symndx >= nsyms)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad reloc symbol index (0x%lx >= 0x%lx)"
" for offset 0x%lx in section `%A'"),
abfd, sec,
@@ -2328,7 +2328,7 @@ elf_link_read_relocs_from_section (bfd *abfd,
}
else if (r_symndx != STN_UNDEF)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A'"
" when the object file has no symbol table"),
abfd, sec,
@@ -2518,7 +2518,7 @@ _bfd_elf_link_output_relocs (bfd *output_bfd,
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation size mismatch in %B section %A"),
output_bfd, input_section->owner, input_section);
bfd_set_error (bfd_error_wrong_format);
@@ -2800,7 +2800,7 @@ _bfd_elf_adjust_dynamic_symbol (struct elf_link_hash_entry *h, void *data)
if (h->size == 0
&& h->type == STT_NOTYPE
&& !h->needs_plt)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("warning: type and size of dynamic symbol `%s' are not defined"),
h->root.root.string);
@@ -4308,7 +4308,7 @@ error_free_dyn:
if (verstr == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: %s: invalid version %u (max %d)"),
abfd, name, vernum,
elf_tdata (abfd)->cverdefs);
@@ -4344,7 +4344,7 @@ error_free_dyn:
}
if (verstr == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: %s: invalid needed version %d"),
abfd, name, vernum);
bfd_set_error (bfd_error_bad_value);
@@ -4598,13 +4598,13 @@ error_free_dyn:
{
/* PR binutils/2735 */
if (normal_bfd == NULL)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: alignment %u of common symbol `%s' in %B is"
" greater than the alignment (%u) of its section %A"),
common_bfd, h->root.u.def.section,
1 << common_align, name, 1 << normal_align);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: alignment %u of symbol `%s' in %B"
" is smaller than %u in %B"),
normal_bfd, common_bfd,
@@ -4620,7 +4620,7 @@ error_free_dyn:
if (h->size != 0
&& h->size != isym->st_size
&& ! size_change_ok)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: size of symbol `%s' changed"
" from %lu in %B to %lu in %B"),
old_bfd, abfd,
@@ -4655,7 +4655,7 @@ error_free_dyn:
if (h->type != type)
{
if (h->type != STT_NOTYPE && ! type_change_ok)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Warning: type of symbol `%s' changed"
" from %d to %d in %B"),
abfd, name, h->type, type);
@@ -4756,7 +4756,7 @@ error_free_dyn:
if (old_bfd != NULL
&& (elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: undefined reference to symbol '%s'"),
old_bfd, name);
bfd_set_error (bfd_error_missing_dso);
@@ -5760,11 +5760,11 @@ bfd_elf_stack_segment_size (bfd *output_bfd,
/* The symbol has no type if specified on the command line. */
h->type = STT_OBJECT;
if (info->stacksize)
- (*_bfd_error_handler) (_("%B: stack size specified and %s set"),
- output_bfd, legacy_symbol);
+ _bfd_error_handler (_("%B: stack size specified and %s set"),
+ output_bfd, legacy_symbol);
else if (h->root.u.def.section != bfd_abs_section_ptr)
- (*_bfd_error_handler) (_("%B: %s not absolute"),
- output_bfd, legacy_symbol);
+ _bfd_error_handler (_("%B: %s not absolute"),
+ output_bfd, legacy_symbol);
else
info->stacksize = h->root.u.def.value;
}
@@ -6060,7 +6060,7 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
for (d = t->globals.list; d != NULL; d = d->next)
if (d->literal && !d->symver && !d->script)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: undefined version: %s"),
d->pattern, t->name);
all_defined = FALSE;
@@ -6128,7 +6128,7 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
if (elf_section_data (o)->this_hdr.sh_type
== SHT_PREINIT_ARRAY)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: .preinit_array section is not allowed in DSO"),
sub);
break;
@@ -9020,7 +9020,7 @@ check_dynsym (bfd *abfd, Elf_Internal_Sym *sym)
{
/* The gABI doesn't support dynamic symbols in output sections
beyond 64k. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Too many sections: %d (>= %d)"),
abfd, bfd_count_sections (abfd), SHN_LORESERVE & 0xffff);
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -9318,8 +9318,8 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data)
def_bfd = flinfo->output_bfd;
if (hi->root.u.def.section != bfd_abs_section_ptr)
def_bfd = hi->root.u.def.section->owner;
- (*_bfd_error_handler) (msg, flinfo->output_bfd, def_bfd,
- h->root.root.string);
+ _bfd_error_handler (msg, flinfo->output_bfd, def_bfd,
+ h->root.root.string);
bfd_set_error (bfd_error_bad_value);
eoinfo->failed = TRUE;
return FALSE;
@@ -9398,7 +9398,7 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data)
input_sec->output_section);
if (sym.st_shndx == SHN_BAD)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: could not find output section %A for input section %A"),
flinfo->output_bfd, input_sec->output_section, input_sec);
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -9557,7 +9557,7 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data)
msg = _("%B: internal symbol `%s' isn't defined");
else
msg = _("%B: hidden symbol `%s' isn't defined");
- (*_bfd_error_handler) (msg, flinfo->output_bfd, h->root.root.string);
+ _bfd_error_handler (msg, flinfo->output_bfd, h->root.root.string);
bfd_set_error (bfd_error_bad_value);
eoinfo->failed = TRUE;
return FALSE;
@@ -9587,7 +9587,7 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data)
if (p && p [1] != '\0')
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: No symbol version section for versioned symbol `%s'"),
flinfo->output_bfd, h->root.root.string);
eoinfo->failed = TRUE;
@@ -10191,7 +10191,7 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
{
if (o->size != o->reloc_count * address_size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("error: %B: size of section %A is not "
"multiple of address size"),
input_bfd, o);
@@ -10238,7 +10238,7 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
char buffer [32];
sprintf_vma (buffer, rel->r_info);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("error: %B contains a reloc (0x%s) for section %A "
"that references a non-existent global symbol"),
input_bfd, o, buffer);
@@ -10990,13 +10990,15 @@ elf_fixup_link_order (bfd *abfd, asection *o)
if (seen_other && seen_linkorder)
{
if (other_sec && linkorder_sec)
- (*_bfd_error_handler) (_("%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"),
- o, linkorder_sec,
- linkorder_sec->owner, other_sec,
- other_sec->owner);
+ _bfd_error_handler
+ (_("%A has both ordered [`%A' in %B] "
+ "and unordered [`%A' in %B] sections"),
+ o, linkorder_sec,
+ linkorder_sec->owner, other_sec,
+ other_sec->owner);
else
- (*_bfd_error_handler) (_("%A has both ordered and unordered sections"),
- o);
+ _bfd_error_handler
+ (_("%A has both ordered and unordered sections"), o);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -11097,8 +11099,8 @@ elf_output_implib (bfd *abfd, struct bfd_link_info *info)
if (symcount == 0)
{
bfd_set_error (bfd_error_no_symbols);
- (*_bfd_error_handler) (_("%B: no symbol found for import library"),
- implib_bfd);
+ _bfd_error_handler (_("%B: no symbol found for import library"),
+ implib_bfd);
goto free_sym_buf;
}
@@ -11719,7 +11721,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
}
bfd_set_error (bfd_error_wrong_format);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: file class %s incompatible with %s"),
sub, iclass, oclass);
}
@@ -11935,8 +11937,8 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
if (info->out_implib_bfd && !elf_output_implib (abfd, info))
{
- (*_bfd_error_handler) (_("%B: failed to generate import library"),
- info->out_implib_bfd);
+ _bfd_error_handler (_("%B: failed to generate import library"),
+ info->out_implib_bfd);
return FALSE;
}
@@ -12046,12 +12048,12 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
o = bfd_get_section_by_name (abfd, name);
if (o == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("could not find section %s"), name);
goto error_return;
}
if (o->size == 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("warning: %s section has zero size"), name);
dyn.d_un.d_val = o->size;
break;
@@ -12093,13 +12095,13 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
do_vma:
if (o == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("could not find section %s"), name);
goto error_return;
}
if (elf_section_data (o->output_section)->this_hdr.sh_type == SHT_NOTE)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("warning: section '%s' is being made into a note"), name);
bfd_set_error (bfd_error_nonrepresentable_section);
goto error_return;
@@ -13083,7 +13085,7 @@ bfd_elf_gc_sections (bfd *abfd, struct bfd_link_info *info)
if (!bed->can_gc_sections
|| !is_elf_hash_table (info->hash))
{
- (*_bfd_error_handler)(_("Warning: gc-sections option ignored"));
+ _bfd_error_handler(_("Warning: gc-sections option ignored"));
return TRUE;
}
@@ -13192,8 +13194,8 @@ bfd_elf_gc_record_vtinherit (bfd *abfd,
goto win;
}
- (*_bfd_error_handler) ("%B: %A+%lu: No symbol found for INHERIT",
- abfd, sec, (unsigned long) offset);
+ _bfd_error_handler ("%B: %A+%lu: No symbol found for INHERIT",
+ abfd, sec, (unsigned long) offset);
bfd_set_error (bfd_error_invalid_operation);
return FALSE;
diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index 734ebf6..c7ca646 100644
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -3436,7 +3436,7 @@ mips_elf_n32_rtype_to_howto (unsigned int r_type, bfd_boolean rela_p)
}
if (r_type >= R_MIPS_max)
{
- (*_bfd_error_handler) (_("unrecognised MIPS reloc number: %d"), r_type);
+ _bfd_error_handler (_("unrecognised MIPS reloc number: %d"), r_type);
bfd_set_error (bfd_error_bad_value);
r_type = R_MIPS_NONE;
}
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 3435a3d..b23db29 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -2833,8 +2833,8 @@ _bfd_aarch64_add_stub_entry_in_group (const char *stub_name,
TRUE, FALSE);
if (stub_entry == NULL)
{
- (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
- section->owner, stub_name);
+ _bfd_error_handler (_("%s: cannot create stub entry %s"),
+ section->owner, stub_name);
return NULL;
}
@@ -2861,7 +2861,7 @@ _bfd_aarch64_add_stub_entry_after (const char *stub_name,
TRUE, FALSE);
if (stub_entry == NULL)
{
- (*_bfd_error_handler) (_("cannot create stub entry %s"), stub_name);
+ _bfd_error_handler (_("cannot create stub entry %s"), stub_name);
return NULL;
}
@@ -4759,9 +4759,9 @@ make_branch_to_erratum_835769_stub (struct bfd_hash_entry *gen_entry,
abfd = stub_entry->target_section->owner;
if (!aarch64_valid_branch_p (veneer_entry_loc, veneered_insn_loc))
- (*_bfd_error_handler)
- (_("%B: error: Erratum 835769 stub out "
- "of range (input file too large)"), abfd);
+ _bfd_error_handler
+ (_("%B: error: Erratum 835769 stub out "
+ "of range (input file too large)"), abfd);
target = stub_entry->target_value;
branch_insn = 0x14000000;
@@ -4840,7 +4840,7 @@ _bfd_aarch64_erratum_843419_branch_to_stub (struct bfd_hash_entry *gen_entry,
abfd = stub_entry->target_section->owner;
if (!aarch64_valid_branch_p (veneer_entry_loc, veneered_insn_loc))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: error: Erratum 843419 stub out "
"of range (input file too large)"), abfd);
@@ -4969,7 +4969,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
else
name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against STT_GNU_IFUNC "
"symbol `%s' isn't handled by %s"), input_bfd,
howto->name, name, __FUNCTION__);
@@ -4984,7 +4984,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
else
name = bfd_elf_sym_name (input_bfd, symtab_hdr,
sym, NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against STT_GNU_IFUNC "
"symbol `%s' has non-zero addend: %d"),
input_bfd, howto->name, name, rel->r_addend);
@@ -5304,7 +5304,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
{
int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against external symbol `%s' can not be used"
" when making a shared object; recompile with -fPIC"),
input_bfd, elfNN_aarch64_howto_table[howto_index].name,
@@ -5370,7 +5370,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
if (locals == NULL)
{
int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Local symbol descriptor table be NULL when applying "
"relocation %s against local symbol"),
input_bfd, elfNN_aarch64_howto_table[howto_index].name);
@@ -5438,7 +5438,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
if (locals == NULL)
{
int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Local symbol descriptor table be NULL when applying "
"relocation %s against local symbol"),
input_bfd, elfNN_aarch64_howto_table[howto_index].name);
@@ -6040,7 +6040,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
if (howto == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unrecognized relocation (0x%x) in section `%A'"),
input_bfd, input_section, r_type);
return FALSE;
@@ -6121,7 +6121,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|| h->root.type == bfd_link_hash_defweak)
&& IS_AARCH64_TLS_RELOC (bfd_r_type) != (sym_type == STT_TLS))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((sym_type == STT_TLS
? _("%B(%A+0x%lx): %s used with TLS symbol %s")
: _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
@@ -6392,7 +6392,7 @@ elfNN_aarch64_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
(_
("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
input_bfd, input_section, (long) rel->r_offset, howto->name,
@@ -7018,8 +7018,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"), abfd,
- r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx);
return FALSE;
}
@@ -7316,7 +7315,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
if (bfd_link_pic (info))
{
int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against `%s' can not be used when making "
"a shared object; recompile with -fPIC"),
abfd, elfNN_aarch64_howto_table[howto_index].name,
@@ -9157,7 +9156,7 @@ elfNN_aarch64_finish_dynamic_sections (bfd *output_bfd,
{
if (bfd_is_abs_section (htab->root.sgotplt->output_section))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("discarded output section: `%A'"), htab->root.sgotplt);
return FALSE;
}
diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
index b8e0e76..0654091 100644
--- a/bfd/elfnn-ia64.c
+++ b/bfd/elfnn-ia64.c
@@ -615,7 +615,7 @@ elfNN_ia64_relax_section (bfd *abfd, asection *sec,
if (strcmp (sec->output_section->name, ".init") == 0
|| strcmp (sec->output_section->name, ".fini") == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."),
sec->owner, sec, (unsigned long) roff);
bfd_set_error (bfd_error_bad_value);
@@ -3681,7 +3681,7 @@ elfNN_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final)
if (max_short_vma - min_short_vma >= 0x400000)
{
overflow:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: short data segment overflowed (0x%lx >= 0x400000)"),
bfd_get_filename (abfd),
(unsigned long) (max_short_vma - min_short_vma));
@@ -3692,7 +3692,7 @@ overflow:
|| (gp_val < max_short_vma
&& max_short_vma - gp_val >= 0x200000))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: __gp does not cover short data segment"),
bfd_get_filename (abfd));
return FALSE;
@@ -3833,7 +3833,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd,
r_type = ELFNN_R_TYPE (rel->r_info);
if (r_type > R_IA64_MAX_RELOC_CODE)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unknown relocation type %d"),
input_bfd, (int) r_type);
bfd_set_error (bfd_error_bad_value);
@@ -3959,7 +3959,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd,
case R_IA64_IMM64:
/* ??? People shouldn't be doing non-pic code in
shared libraries nor dynamic executables. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: non-pic code with imm relocation against dynamic symbol `%s'"),
input_bfd,
h ? h->root.root.string
@@ -4026,7 +4026,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd,
case R_IA64_GPREL64LSB:
if (dynamic_symbol_p)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: @gprel relocation against dynamic symbol %s"),
input_bfd,
h ? h->root.root.string
@@ -4089,7 +4089,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd,
dynamic symbol table. */
/* ??? People shouldn't be doing non-pic code in
shared libraries. Hork. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking non-pic code in a position independent executable"),
input_bfd);
ret_val = FALSE;
@@ -4232,12 +4232,12 @@ elfNN_ia64_relocate_section (bfd *output_bfd,
msg = _("%B: speculation fixup to dynamic symbol %s");
else
msg = _("%B: @pcrel relocation against dynamic symbol %s");
- (*_bfd_error_handler) (msg, input_bfd,
- h ? h->root.root.string
- : bfd_elf_sym_name (input_bfd,
- symtab_hdr,
- sym,
- sym_sec));
+ _bfd_error_handler (msg, input_bfd,
+ h ? h->root.root.string
+ : bfd_elf_sym_name (input_bfd,
+ symtab_hdr,
+ sym,
+ sym_sec));
ret_val = FALSE;
continue;
}
@@ -4464,7 +4464,7 @@ missing_tls_sec:
case R_IA64_LTOFF_TPREL22:
case R_IA64_LTOFF_DTPMOD22:
case R_IA64_LTOFF_DTPREL22:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."),
input_bfd, input_section, howto->name, name,
rel->r_offset);
@@ -4479,7 +4479,7 @@ missing_tls_sec:
/* Relaxtion is always performed for ELF output.
Overflow failures for those relocations mean
that the section is too big to relax. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."),
input_bfd, input_section, howto->name, name,
rel->r_offset, input_section->size);
@@ -4740,7 +4740,7 @@ elfNN_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if ((in_flags & EF_IA_64_TRAPNIL) != (out_flags & EF_IA_64_TRAPNIL))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking trap-on-NULL-dereference with non-trapping files"),
ibfd);
@@ -4749,7 +4749,7 @@ elfNN_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
}
if ((in_flags & EF_IA_64_BE) != (out_flags & EF_IA_64_BE))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking big-endian files with little-endian files"),
ibfd);
@@ -4758,7 +4758,7 @@ elfNN_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
}
if ((in_flags & EF_IA_64_ABI64) != (out_flags & EF_IA_64_ABI64))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking 64-bit files with 32-bit files"),
ibfd);
@@ -4767,7 +4767,7 @@ elfNN_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
}
if ((in_flags & EF_IA_64_CONS_GP) != (out_flags & EF_IA_64_CONS_GP))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking constant-gp files with non-constant-gp files"),
ibfd);
@@ -4777,7 +4777,7 @@ elfNN_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if ((in_flags & EF_IA_64_NOFUNCDESC_CONS_GP)
!= (out_flags & EF_IA_64_NOFUNCDESC_CONS_GP))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking auto-pic files with non-auto-pic files"),
ibfd);
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index ffc524f..c1eeb71 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -3751,7 +3751,7 @@ mips_elf_create_local_got_entry (bfd *abfd, struct bfd_link_info *info,
if (g->assigned_low_gotno > g->assigned_high_gotno)
{
/* We didn't allocate enough space in the GOT. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("not enough GOT space for local GOT entries"));
bfd_set_error (bfd_error_bad_value);
return NULL;
@@ -5620,7 +5620,7 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
if ((mips16_branch_reloc_p (r_type) && target_is_micromips_code_p)
|| (micromips_branch_reloc_p (r_type) && target_is_16_bit_code_p))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("MIPS16 and microMIPS functions cannot call each other"));
return bfd_reloc_notsupported;
}
@@ -7116,7 +7116,7 @@ _bfd_mips_elf_section_processing (bfd *abfd, Elf_Internal_Shdr *hdr)
&intopt);
if (intopt.size < sizeof (Elf_External_Options))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Warning: bad `%s' option size %u smaller than its header"),
abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size);
break;
@@ -7349,7 +7349,7 @@ _bfd_mips_elf_section_from_shdr (bfd *abfd,
&intopt);
if (intopt.size < sizeof (Elf_External_Options))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Warning: bad `%s' option size %u smaller than its header"),
abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size);
break;
@@ -8119,7 +8119,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
r_symndx = mips16_stub_symndx (bed, sec, relocs, rel_end);
if (r_symndx == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Warning: cannot determine the target function for"
" stub section `%s'"),
abfd, name);
@@ -8244,7 +8244,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
r_symndx = mips16_stub_symndx (bed, sec, relocs, rel_end);
if (r_symndx == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Warning: cannot determine the target function for"
" stub section `%s'"),
abfd, name);
@@ -8375,7 +8375,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
h = NULL;
else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Malformed reloc detected for section %s"),
abfd, name);
bfd_set_error (bfd_error_bad_value);
@@ -8450,7 +8450,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
return FALSE;
if (htab->is_vxworks && !bfd_link_pic (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: GOT reloc at 0x%lx not expected in executables"),
abfd, (unsigned long) rel->r_offset);
bfd_set_error (bfd_error_bad_value);
@@ -8587,7 +8587,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
case R_MICROMIPS_CALL16:
if (h == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: CALL16 reloc at 0x%lx not against global symbol"),
abfd, (unsigned long) rel->r_offset);
bfd_set_error (bfd_error_bad_value);
@@ -8872,7 +8872,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
case R_MIPS_26:
case R_MICROMIPS_26_S1:
howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, r_type, FALSE);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
abfd, howto->name,
(h) ? h->root.root.string : "a local symbol");
@@ -9368,9 +9368,9 @@ _bfd_mips_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
some that we can't convert. */
if (!htab->use_plts_and_copy_relocs || bfd_link_pic (info))
{
- (*_bfd_error_handler) (_("non-dynamic relocations refer to "
- "dynamic symbol %s"),
- h->root.root.string);
+ _bfd_error_handler (_("non-dynamic relocations refer to "
+ "dynamic symbol %s"),
+ h->root.root.string);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -10277,7 +10277,7 @@ _bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
name = bfd_elf_sym_name (input_bfd, symtab_hdr,
local_syms + r_symndx,
sec);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"),
input_bfd, input_section, name, howto->name,
rel->r_offset);
@@ -10819,7 +10819,7 @@ _bfd_mips_elf_finish_dynamic_symbol (bfd *output_bfd,
/* ADDIUPC has a span of +/-16MB, check we're in range. */
if (gotpc_offset + 0x1000000 >= 0x2000000)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%A' offset of %ld from `%A' "
"beyond the range of ADDIUPC"),
output_bfd,
@@ -11382,7 +11382,7 @@ mips_finish_exec_plt (bfd *output_bfd, struct bfd_link_info *info)
/* ADDIUPC has a span of +/-16MB, check we're in range. */
if (gotpc_offset + 0x1000000 >= 0x2000000)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%A' offset of %ld from `%A' beyond the range of ADDIUPC"),
output_bfd,
htab->sgotplt->output_section,
@@ -14294,7 +14294,7 @@ update_mips_abiflags_isa (bfd *abfd, Elf_Internal_ABIFlags_v0 *abiflags)
case E_MIPS_ARCH_64R2: new_isa = LEVEL_REV (64, 2); break;
case E_MIPS_ARCH_64R6: new_isa = LEVEL_REV (64, 6); break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Unknown architecture %s"),
abfd, bfd_printable_name (abfd));
}
@@ -14823,7 +14823,7 @@ _bfd_mips_elf_final_link (bfd *abfd, struct bfd_link_info *info)
gptab_bss_sec = o;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: illegal section name `%s'"),
bfd_get_filename (abfd), o->name);
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -15100,7 +15100,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, bfd *obfd)
if (((new_flags & (EF_MIPS_PIC | EF_MIPS_CPIC)) != 0)
!= ((old_flags & (EF_MIPS_PIC | EF_MIPS_CPIC)) != 0))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: linking abicalls files with non-abicalls files"),
ibfd);
ok = TRUE;
@@ -15117,7 +15117,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, bfd *obfd)
/* Compare the ISAs. */
if (mips_32bit_flags_p (old_flags) != mips_32bit_flags_p (new_flags))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking 32-bit code with 64-bit code"),
ibfd);
ok = FALSE;
@@ -15148,7 +15148,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, bfd *obfd)
else
{
/* The ISAs aren't compatible. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: linking %s module with previous %s modules"),
ibfd,
bfd_printable_name (ibfd),
@@ -15171,7 +15171,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, bfd *obfd)
|| (elf_elfheader (ibfd)->e_ident[EI_CLASS]
!= elf_elfheader (obfd)->e_ident[EI_CLASS]))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: ABI mismatch: linking %s module with previous %s modules"),
ibfd,
elf_mips_abi_name (ibfd),
@@ -15195,7 +15195,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, bfd *obfd)
if (m16_mis || micro_mis)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: ASE mismatch: linking %s module with previous %s modules"),
ibfd,
m16_mis ? "MIPS16" : "microMIPS",
@@ -15240,7 +15240,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, bfd *obfd)
/* Warn about any other mismatches */
if (new_flags != old_flags)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: uses different e_flags (0x%lx) fields than previous modules "
"(0x%lx)"),
ibfd, (unsigned long) new_flags,
@@ -15447,7 +15447,7 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
/* Check if we have the same endianness. */
if (! _bfd_generic_verify_endian_match (ibfd, obfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: endianness incompatible with that of the selected emulation"),
ibfd);
return FALSE;
@@ -15461,7 +15461,7 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (strcmp (bfd_get_target (ibfd), bfd_get_target (obfd)) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: ABI is incompatible with that of the selected emulation"),
ibfd);
return FALSE;
@@ -15513,27 +15513,27 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (LEVEL_REV (in_abiflags.isa_level, in_abiflags.isa_rev)
< LEVEL_REV (abiflags.isa_level, abiflags.isa_rev))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Inconsistent ISA between e_flags and "
".MIPS.abiflags"), ibfd);
if (abiflags.fp_abi != Val_GNU_MIPS_ABI_FP_ANY
&& in_abiflags.fp_abi != abiflags.fp_abi)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Inconsistent FP ABI between .gnu.attributes and "
".MIPS.abiflags"), ibfd);
if ((in_abiflags.ases & abiflags.ases) != abiflags.ases)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Inconsistent ASEs between e_flags and "
".MIPS.abiflags"), ibfd);
/* The isa_ext is allowed to be an extension of what can be inferred
from e_flags. */
if (!mips_mach_extends_p (bfd_mips_isa_ext_mach (abiflags.isa_ext),
bfd_mips_isa_ext_mach (in_abiflags.isa_ext)))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Inconsistent ISA extensions between e_flags and "
".MIPS.abiflags"), ibfd);
if (in_abiflags.flags2 != 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Unexpected flag in the flags2 field of "
".MIPS.abiflags (0x%lx)"), ibfd,
(unsigned long) in_abiflags.flags2);
diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index 30daedf..ddc0986 100644
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -636,8 +636,7 @@ _bfd_sparc_elf_info_to_howto_ptr (unsigned int r_type)
default:
if (r_type >= (unsigned int) R_SPARC_max_std)
{
- (*_bfd_error_handler) (_("invalid relocation type %d"),
- (int) r_type);
+ _bfd_error_handler (_("invalid relocation type %d"), (int) r_type);
r_type = R_SPARC_NONE;
}
return &_bfd_sparc_elf_howto_table[r_type];
@@ -1412,8 +1411,7 @@ _bfd_sparc_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd, r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx);
return FALSE;
}
@@ -1592,7 +1590,7 @@ _bfd_sparc_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
tls_type = old_tls_type;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' accessed both as normal and thread local symbol"),
abfd, h ? h->root.root.string : "<local>");
return FALSE;
@@ -3148,7 +3146,7 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd,
else
name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
NULL);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: relocation %s against STT_GNU_IFUNC "
"symbol `%s' isn't handled by %s"), input_bfd,
_bfd_sparc_elf_howto_table[r_type].name,
@@ -3527,7 +3525,7 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd,
if (indx == 0)
{
BFD_FAIL ();
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: probably compiled without -fPIC?"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
@@ -3907,7 +3905,7 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd,
&& h->def_dynamic)
&& _bfd_elf_section_offset (output_bfd, info, input_section,
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,
diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index db266c1..419ca2f 100644
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -1725,8 +1725,8 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd, r_symndx);
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
return FALSE;
}
@@ -1832,7 +1832,7 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
tls_type = old_tls_type;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' accessed both as normal and thread local symbol"),
abfd, h ? h->root.root.string : "<local>");
return FALSE;
@@ -3170,7 +3170,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
if ((unsigned int)r_type >= ARRAY_SIZE (tilegx_elf_howto_table))
{
/* Not clear if we need to check here, but just be paranoid. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unrecognized relocation (0x%x) in section `%A'"),
input_bfd, r_type, input_section);
bfd_set_error (bfd_error_bad_value);
@@ -3729,7 +3729,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
if (indx == 0)
{
BFD_FAIL ();
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: probably compiled without -fPIC?"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
@@ -3978,7 +3978,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
&& h->def_dynamic)
&& _bfd_elf_section_offset (output_bfd, info, input_section,
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,
@@ -4326,7 +4326,7 @@ tilegx_elf_finish_dynamic_sections (bfd *output_bfd,
{
if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("discarded output section: `%A'"), htab->elf.sgotplt);
return FALSE;
}
@@ -4433,7 +4433,7 @@ _bfd_tilegx_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (strcmp (targ1, targ2) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: Cannot link together %s and %s objects."),
ibfd, targ1, targ2);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/hpux-core.c b/bfd/hpux-core.c
index 1292a5b..341574b 100644
--- a/bfd/hpux-core.c
+++ b/bfd/hpux-core.c
@@ -336,7 +336,7 @@ hpux_core_core_file_p (bfd *abfd)
built.
*/
if ((unknown_sections > 0) && (good_sections > 0))
- (*_bfd_error_handler)
+ _bfd_error_handler
("%s appears to be a core file,\nbut contains unknown sections. It may have been created on an incompatible\nversion of HP-UX. As a result, some information may be unavailable.\n",
abfd->filename);
diff --git a/bfd/i386linux.c b/bfd/i386linux.c
index 6ca50c9..8e9f8b4 100644
--- a/bfd/i386linux.c
+++ b/bfd/i386linux.c
@@ -413,14 +413,14 @@ linux_tally_symbols (struct linux_link_hash_entry *h, void * data)
alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
if (p == NULL || alloc == NULL)
- (*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
- name);
+ _bfd_error_handler (_("Output file requires shared library `%s'\n"),
+ name);
else
{
strcpy (alloc, name);
p = strrchr (alloc, '_');
*p++ = '\0';
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Output file requires shared library `%s.so.%s'\n"),
alloc, p);
free (alloc);
@@ -607,7 +607,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
if (f->h->root.root.type != bfd_link_hash_defined
&& f->h->root.root.type != bfd_link_hash_defweak)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
f->h->root.root.root.string);
continue;
@@ -657,7 +657,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
if (f->h->root.root.type != bfd_link_hash_defined
&& f->h->root.root.type != bfd_link_hash_defweak)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
f->h->root.root.root.string);
continue;
@@ -682,7 +682,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
if (linux_hash_table (info)->fixup_count != fixups_written)
{
- (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
+ _bfd_error_handler (_("Warning: fixup count mismatch\n"));
while (linux_hash_table (info)->fixup_count > fixups_written)
{
bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
diff --git a/bfd/ieee.c b/bfd/ieee.c
index 73b3f98..2bcf58d 100644
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -154,7 +154,7 @@ ieee_write_id (bfd *abfd, const char *id)
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: string too long (%d chars, max 65535)"),
bfd_get_filename (abfd), length);
bfd_set_error (bfd_error_invalid_operation);
@@ -288,7 +288,7 @@ ieee_write_expression (bfd *abfd,
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: unrecognized symbol `%s' flags 0x%x"),
bfd_get_filename (abfd), bfd_asymbol_name (symbol),
symbol->flags);
@@ -823,7 +823,7 @@ ieee_slurp_external_symbols (bfd *abfd)
parse_int (&ieee->h, &value);
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unimplemented ATI record %u for symbol %u"),
abfd, symbol_attribute_def, symbol_name_index);
bfd_set_error (bfd_error_bad_value);
@@ -847,7 +847,7 @@ ieee_slurp_external_symbols (bfd *abfd)
parse_int (&ieee->h, &value);
if (value != 0x3f)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unexpected ATN type %d in external part"),
abfd, (int) value);
bfd_set_error (bfd_error_bad_value);
@@ -869,7 +869,7 @@ ieee_slurp_external_symbols (bfd *abfd)
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unexpected type after ATN"), abfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;
diff --git a/bfd/ihex.c b/bfd/ihex.c
index 27e197d..636632f 100644
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -225,7 +225,7 @@ ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error)
buf[0] = c;
buf[1] = '\0';
}
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%d: unexpected character `%s' in Intel Hex file"),
abfd, lineno, buf);
bfd_set_error (bfd_error_bad_value);
@@ -332,7 +332,7 @@ ihex_scan (bfd *abfd)
chksum += HEX2 (buf + 2 * i);
if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
abfd, lineno,
(- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
@@ -387,7 +387,7 @@ ihex_scan (bfd *abfd)
/* An extended address record. */
if (len != 2)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad extended address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -404,7 +404,7 @@ ihex_scan (bfd *abfd)
/* An extended start address record. */
if (len != 4)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad extended start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -421,7 +421,7 @@ ihex_scan (bfd *abfd)
/* An extended linear address record. */
if (len != 2)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad extended linear address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -438,7 +438,7 @@ ihex_scan (bfd *abfd)
/* An extended linear start address record. */
if (len != 2 && len != 4)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad extended linear start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -455,7 +455,7 @@ ihex_scan (bfd *abfd)
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: unrecognized ihex type %u in Intel Hex file"),
abfd, lineno, type);
bfd_set_error (bfd_error_bad_value);
@@ -574,7 +574,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
/* We should only see type 0 records here. */
if (type != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: internal error in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
@@ -608,7 +608,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
if ((bfd_size_type) (p - contents) < section->size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad section length in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
@@ -821,7 +821,7 @@ ihex_write_object_contents (bfd *abfd)
char buf[20];
sprintf_vma (buf, where);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: address 0x%s out of range for Intel Hex file"),
bfd_get_filename (abfd), buf);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 7406c18..4583335 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -785,7 +785,7 @@ _bfd_generic_get_section_contents (bfd *abfd,
if (section->compress_status != COMPRESS_SECTION_NONE)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: unable to get decompressed section %A"),
abfd, section);
bfd_set_error (bfd_error_invalid_operation);
@@ -939,7 +939,7 @@ _bfd_generic_verify_endian_match (bfd *ibfd, bfd *obfd)
else
msg = _("%B: compiled for a little endian system and target is big endian");
- (*_bfd_error_handler) (msg, ibfd);
+ _bfd_error_handler (msg, ibfd);
bfd_set_error (bfd_error_wrong_format);
return FALSE;
diff --git a/bfd/linker.c b/bfd/linker.c
index 533eff8..8dff5a0 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -1477,7 +1477,7 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info,
row = COMMON_ROW;
if (!bfd_link_relocatable (info)
&& strcmp (name, "__gnu_lto_slim") == 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: plugin needed to handle lto object"),
bfd_get_filename (abfd));
}
@@ -1738,7 +1738,7 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info,
if (inh->type == bfd_link_hash_indirect
&& inh->u.i.link == h)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: indirect symbol `%s' to `%s' is a loop"),
abfd, name, string);
bfd_set_error (bfd_error_invalid_operation);
@@ -2606,7 +2606,7 @@ default_indirect_link_order (bfd *output_bfd,
because somebody is attempting to link together different
types of object files. Handling this case correctly is
difficult, and sometimes impossible. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Attempt to do relocatable link with %s input and %s output"),
bfd_get_target (input_bfd), bfd_get_target (output_bfd));
bfd_set_error (bfd_error_wrong_format);
diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c
index ec6e3d2..fa78ded 100644
--- a/bfd/m68klinux.c
+++ b/bfd/m68klinux.c
@@ -416,14 +416,14 @@ linux_tally_symbols (struct linux_link_hash_entry *h,
alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
if (p == NULL || alloc == NULL)
- (*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
- name);
+ _bfd_error_handler (_("Output file requires shared library `%s'\n"),
+ name);
else
{
strcpy (alloc, name);
p = strrchr (alloc, '_');
*p++ = '\0';
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Output file requires shared library `%s.so.%s'\n"),
alloc, p);
free (alloc);
@@ -612,7 +612,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
if (f->h->root.root.type != bfd_link_hash_defined
&& f->h->root.root.type != bfd_link_hash_defweak)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
f->h->root.root.root.string);
continue;
@@ -660,7 +660,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
if (f->h->root.root.type != bfd_link_hash_defined
&& f->h->root.root.type != bfd_link_hash_defweak)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
f->h->root.root.root.string);
continue;
@@ -685,7 +685,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
if (linux_hash_table (info)->fixup_count != fixups_written)
{
- (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
+ _bfd_error_handler (_("Warning: fixup count mismatch\n"));
while (linux_hash_table (info)->fixup_count > fixups_written)
{
bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 1609980..80aa499 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -775,7 +775,7 @@ bfd_mach_o_canonicalize_symtab (bfd *abfd, asymbol **alocation)
if (!bfd_mach_o_read_symtab_symbols (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("bfd_mach_o_canonicalize_symtab: unable to load symbols"));
return 0;
}
@@ -1978,8 +1978,8 @@ bfd_mach_o_build_dysymtab (bfd *abfd, bfd_mach_o_dysymtab_command *cmd)
|| cmd->ntoc != 0
|| cmd->nextrefsyms != 0)
{
- (*_bfd_error_handler) (_("sorry: modtab, toc and extrefsyms are not yet"
- " implemented for dysymtab commands."));
+ _bfd_error_handler (_("sorry: modtab, toc and extrefsyms are not yet"
+ " implemented for dysymtab commands."));
return FALSE;
}
@@ -2421,8 +2421,8 @@ bfd_mach_o_mangle_sections (bfd *abfd, bfd_mach_o_data_struct *mdata)
/* We need to check that this can be done... */
if (nsect > 255)
{
- (*_bfd_error_handler) (_("mach-o: there are too many sections (%u)"
- " maximum is 255,\n"), nsect);
+ _bfd_error_handler (_("mach-o: there are too many sections (%u)"
+ " maximum is 255,\n"), nsect);
return FALSE;
}
@@ -2527,7 +2527,7 @@ bfd_mach_o_write_contents (bfd *abfd)
/* Nothing to do. */
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("unable to allocate data for load command 0x%lx"),
(unsigned long) cmd->type);
break;
@@ -2632,7 +2632,7 @@ bfd_mach_o_write_contents (bfd *abfd)
return FALSE;
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("unable to write unknown load command 0x%lx"),
(unsigned long) cmd->type);
return FALSE;
@@ -2815,7 +2815,7 @@ bfd_mach_o_build_exec_seg_command (bfd *abfd, bfd_mach_o_segment_command *seg)
if (s->addr < vma)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("section address (%lx) below start of segment (%lx)"),
(unsigned long) s->addr, (unsigned long) vma);
return FALSE;
@@ -2956,7 +2956,7 @@ bfd_mach_o_layout_commands (bfd_mach_o_data_struct *mdata)
+ BFD_MACH_O_LC_SIZE;
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("unable to layout unknown load command 0x%lx"),
(unsigned long) cmd->type);
ret = FALSE;
@@ -3492,8 +3492,9 @@ bfd_mach_o_read_section_32 (bfd *abfd, unsigned long prot)
/* PR 17512: file: 0017eb76. */
if (section->align > 64)
{
- (*_bfd_error_handler) (_("bfd_mach_o_read_section_32: overlarge alignment value: 0x%x, using 32 instead"),
- section->align);
+ _bfd_error_handler
+ (_("bfd_mach_o_read_section_32: overlarge alignment value: 0x%x, "
+ "using 32 instead"), section->align);
section->align = 32;
}
section->reloff = bfd_h_get_32 (abfd, raw.reloff);
@@ -3534,8 +3535,9 @@ bfd_mach_o_read_section_64 (bfd *abfd, unsigned long prot)
section->align = bfd_h_get_32 (abfd, raw.align);
if (section->align > 64)
{
- (*_bfd_error_handler) (_("bfd_mach_o_read_section_64: overlarge alignment value: 0x%x, using 32 instead"),
- section->align);
+ _bfd_error_handler
+ (_("bfd_mach_o_read_section_64: overlarge alignment value: 0x%x, "
+ "using 32 instead"), section->align);
section->align = 32;
}
section->reloff = bfd_h_get_32 (abfd, raw.reloff);
@@ -3583,7 +3585,7 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
if (bfd_seek (abfd, symoff, SEEK_SET) != 0
|| bfd_bread (&raw, symwidth, abfd) != symwidth)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"),
symwidth, (unsigned long) symoff);
return FALSE;
@@ -3601,7 +3603,7 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
if (stroff >= sym->strsize)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("bfd_mach_o_read_symtab_symbol: name out of range (%lu >= %lu)"),
(unsigned long) stroff,
(unsigned long) sym->strsize);
@@ -3683,9 +3685,11 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
/* Mach-O uses 0 to mean "no section"; not an error. */
if (section != 0)
{
- (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: "
- "symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"),
- s->symbol.name, section, mdata->nsects);
+ _bfd_error_handler
+ (_("bfd_mach_o_read_symtab_symbol: "
+ "symbol \"%s\" specified invalid section %d (max %lu): "
+ "setting to undefined"),
+ s->symbol.name, section, mdata->nsects);
}
s->symbol.section = bfd_und_section_ptr;
}
@@ -3699,9 +3703,10 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
s->symbol.value = 0;
break;
default:
- (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: "
- "symbol \"%s\" specified invalid type field 0x%x: setting to undefined"),
- s->symbol.name, symtype);
+ _bfd_error_handler
+ (_("bfd_mach_o_read_symtab_symbol: "
+ "symbol \"%s\" specified invalid type field 0x%x: "
+ "setting to undefined"), s->symbol.name, symtype);
s->symbol.section = bfd_und_section_ptr;
break;
}
@@ -3773,7 +3778,8 @@ bfd_mach_o_read_symtab_symbols (bfd *abfd)
sym->symbols = bfd_alloc2 (abfd, sym->nsyms, sizeof (bfd_mach_o_asymbol));
if (sym->symbols == NULL)
{
- (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"));
+ _bfd_error_handler (_("bfd_mach_o_read_symtab_symbols: "
+ "unable to allocate memory for symbols"));
sym->nsyms = 0;
return FALSE;
}
@@ -4745,8 +4751,8 @@ bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command)
break;
default:
command->len = 0;
- (*_bfd_error_handler)(_("%B: unknown load command 0x%lx"),
- abfd, (unsigned long) command->type);
+ _bfd_error_handler (_("%B: unknown load command 0x%lx"),
+ abfd, (unsigned long) command->type);
return FALSE;
}
@@ -4934,7 +4940,7 @@ bfd_mach_o_scan (bfd *abfd,
&cputype, &cpusubtype);
if (cputype == bfd_arch_unknown)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"),
header->cputype, header->cpusubtype);
return FALSE;
@@ -5040,8 +5046,8 @@ bfd_mach_o_header_p (bfd *abfd,
if (! (header.byteorder == BFD_ENDIAN_BIG
|| header.byteorder == BFD_ENDIAN_LITTLE))
{
- (*_bfd_error_handler) (_("unknown header byte-order value 0x%lx"),
- (unsigned long) header.byteorder);
+ _bfd_error_handler (_("unknown header byte-order value 0x%lx"),
+ (unsigned long) header.byteorder);
goto wrong;
}
diff --git a/bfd/merge.c b/bfd/merge.c
index a892dde..23e1e62 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -859,11 +859,9 @@ _bfd_merged_section_offset (bfd *output_bfd ATTRIBUTE_UNUSED, asection **psec,
if (offset >= sec->rawsize)
{
if (offset > sec->rawsize)
- {
- (*_bfd_error_handler)
- (_("%s: access beyond end of merged section (%ld)"),
- bfd_get_filename (sec->owner), (long) offset);
- }
+ _bfd_error_handler
+ (_("%s: access beyond end of merged section (%ld)"),
+ bfd_get_filename (sec->owner), (long) offset);
return secinfo->first_str ? sec->size : 0;
}
diff --git a/bfd/mmo.c b/bfd/mmo.c
index dbfc9ac..5d0ad4e 100644
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -463,7 +463,7 @@ mmo_make_section (bfd *abfd, const char *secname)
if (newsecname == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: No core to allocate section name %s\n"),
bfd_get_filename (abfd), secname);
bfd_set_error (bfd_error_system_call);
@@ -538,7 +538,7 @@ mmo_object_p (bfd *abfd)
if (abfd->tdata.mmo_data->lop_stab_symbol == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: No core to allocate a symbol %d bytes long\n"),
bfd_get_filename (abfd), abfd->tdata.mmo_data->max_symbol_length);
goto bad_final;
@@ -951,7 +951,7 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc,
group-wise aligned. */
if ((vma & 3) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: attempt to emit contents at non-multiple-of-4 address 0x%lx\n"),
bfd_get_filename (abfd), (unsigned long) vma);
bfd_set_error (bfd_error_bad_value);
@@ -1247,7 +1247,7 @@ mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum
&& bfd_get_start_address (abfd) != addr
&& !mmo_ignore_symbol_consistency (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: initialization value for $255 is not `Main'\n"),
bfd_get_filename (abfd));
bfd_set_error (bfd_error_bad_value);
@@ -1392,7 +1392,7 @@ SUBSECTION
abfd->tdata.mmo_data->lop_stab_symbol
[abfd->tdata.mmo_data->symbol_position] = 0;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: unsupported wide character sequence"
" 0x%02X 0x%02X after symbol name starting with `%s'\n"),
bfd_get_filename (abfd), c, c2,
@@ -1626,7 +1626,7 @@ mmo_scan (bfd *abfd)
switch (buf[1])
{
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: unsupported lopcode `%d'\n"),
bfd_get_filename (abfd), buf[1]);
bfd_set_error (bfd_error_bad_value);
@@ -1636,7 +1636,7 @@ mmo_scan (bfd *abfd)
/* Quote the next 32-bit word. */
if (y != 0 || z != 1)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"),
bfd_get_filename (abfd), y*256+z);
bfd_set_error (bfd_error_bad_value);
@@ -1672,7 +1672,7 @@ mmo_scan (bfd *abfd)
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"),
bfd_get_filename (abfd), z);
bfd_set_error (bfd_error_bad_value);
@@ -1721,7 +1721,7 @@ mmo_scan (bfd *abfd)
}
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"),
bfd_get_filename (abfd), z);
bfd_set_error (bfd_error_bad_value);
@@ -1760,7 +1760,7 @@ mmo_scan (bfd *abfd)
if (y != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"),
bfd_get_filename (abfd), y);
bfd_set_error (bfd_error_bad_value);
@@ -1769,7 +1769,7 @@ mmo_scan (bfd *abfd)
if (z != 16 && z != 24)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"),
bfd_get_filename (abfd), z);
bfd_set_error (bfd_error_bad_value);
@@ -1792,7 +1792,7 @@ mmo_scan (bfd *abfd)
p = vma - 4 * ((delta & 0xffffff) - (1 << z));
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"),
bfd_get_filename (abfd), buf[0]);
bfd_set_error (bfd_error_bad_value);
@@ -1815,7 +1815,7 @@ mmo_scan (bfd *abfd)
if (fname == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: cannot allocate file name for file number %d, %d bytes\n"),
bfd_get_filename (abfd), y, z * 4 + 1);
bfd_set_error (bfd_error_system_call);
@@ -1835,7 +1835,7 @@ mmo_scan (bfd *abfd)
if (file_names[y] != NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: file number %d `%s',"
" was already entered as `%s'\n"),
bfd_get_filename (abfd), y, fname, file_names[y]);
@@ -1848,7 +1848,7 @@ mmo_scan (bfd *abfd)
if (file_names[y] == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: file name for number %d"
" was not specified before use\n"),
bfd_get_filename (abfd), y);
@@ -1954,7 +1954,7 @@ mmo_scan (bfd *abfd)
/* We read in the symbols now, not later. */
if (y != 0 || z != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: fields y and z of lop_stab"
" non-zero, y: %d, z: %d\n"),
bfd_get_filename (abfd), y, z);
@@ -1990,7 +1990,7 @@ mmo_scan (bfd *abfd)
if (statbuf.st_size != curpos)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: lop_end not last item in"
" file\n"),
bfd_get_filename (abfd));
@@ -2003,7 +2003,7 @@ mmo_scan (bfd *abfd)
it. */
if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid mmo file: YZ of lop_end (%ld)"
" not equal to the number of tetras to the preceding"
" lop_stab (%ld)\n"),
@@ -2713,7 +2713,7 @@ mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp,
we discover it and bail out. */
if (trie->sym.name != NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid symbol table: duplicate symbol `%s'\n"),
bfd_get_filename (abfd), trie->sym.name);
bfd_set_error (bfd_error_bad_value);
@@ -2955,7 +2955,7 @@ mmo_write_symbols_and_terminator (bfd *abfd)
sprintf_vma (vmas_main, mainvalue);
sprintf_vma (vmas_start, vma_start);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: Bad symbol definition: `Main' set to %s rather"
" than the start address %s\n"),
bfd_get_filename (abfd), vmas_main, vmas_start);
@@ -3053,7 +3053,7 @@ mmo_write_symbols_and_terminator (bfd *abfd)
There's no specific test-case. */
struct mmo_symbol sym;
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: symbol table too large for mmo, larger than 65535"
" 32-bit words: %d. Only `Main' will be emitted.\n"),
bfd_get_filename (abfd), trie_len);
@@ -3098,7 +3098,7 @@ mmo_write_symbols_and_terminator (bfd *abfd)
/* I haven't seen this trig. It seems no use claiming this case
isn't debugged and abort if we get here. Instead emit a
diagnostic and fail "normally". */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: internal error, symbol table changed size from %d to %d"
" words\n"),
bfd_get_filename (abfd), trie_len,
@@ -3150,7 +3150,7 @@ mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p)
/* Make sure it hasn't got contents. It seems impossible to
make it carry contents, so we don't have a test-case for
this. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: internal error, internal register section %s had"
" contents\n"),
bfd_get_filename (abfd), sec->name);
@@ -3201,18 +3201,18 @@ mmo_write_object_contents (bfd *abfd)
if (sec->size == 0)
/* There must always be at least one such register. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: no initialized registers; section length 0\n"),
bfd_get_filename (abfd));
else if (sec->vma > (256 - 32) * 8)
/* Provide better error message for the case of too many
global registers. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: too many initialized registers; section length %ld\n"),
bfd_get_filename (abfd),
(long) sec->size);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: invalid start address for initialized registers of"
" length %ld: 0x%lx%08lx\n"),
bfd_get_filename (abfd),
diff --git a/bfd/oasys.c b/bfd/oasys.c
index 31555e0..cbc3578 100644
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -875,7 +875,7 @@ oasys_write_sections (bfd *abfd)
{
if (!ISDIGIT (s->name[0]))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: can not represent section `%s' in oasys"),
bfd_get_filename (abfd), s->name);
bfd_set_error (bfd_error_nonrepresentable_section);
diff --git a/bfd/osf-core.c b/bfd/osf-core.c
index a0da20f..ee864dd 100644
--- a/bfd/osf-core.c
+++ b/bfd/osf-core.c
@@ -124,8 +124,8 @@ osf_core_core_file_p (bfd *abfd)
flags = SEC_HAS_CONTENTS;
break;
default:
- (*_bfd_error_handler) (_("Unhandled OSF/1 core file section type %d\n"),
- core_scnhdr.scntype);
+ _bfd_error_handler (_("Unhandled OSF/1 core file section type %d\n"),
+ core_scnhdr.scntype);
continue;
}
diff --git a/bfd/pdp11.c b/bfd/pdp11.c
index 74617fc..7daf52d 100644
--- a/bfd/pdp11.c
+++ b/bfd/pdp11.c
@@ -1147,7 +1147,7 @@ NAME (aout, set_section_contents) (bfd *abfd,
if (section != obj_textsec (abfd)
&& section != obj_datasec (abfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%s: can not represent section `%s' in a.out object file format",
bfd_get_filename (abfd), bfd_get_section_name (abfd, section));
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -1379,7 +1379,7 @@ translate_to_native_sym_flags (bfd *abfd,
{
/* This case occurs, e.g., for the *DEBUG* section of a COFF
file. */
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: can not represent section for symbol `%s' in a.out object file format",
abfd, cache_ptr->name != NULL ? cache_ptr->name : "*unknown*");
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -1406,7 +1406,7 @@ translate_to_native_sym_flags (bfd *abfd,
sym_pointer->e_type[0] = N_UNDF | N_EXT;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: can not represent section `%A' in a.out object file format",
abfd, sec);
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -3699,7 +3699,7 @@ NAME (aout, final_link) (bfd *abfd,
and call get_reloc_upper_bound and canonicalize_reloc to
work out the number of relocs needed, and then multiply
by the reloc size. */
- (*_bfd_error_handler)
+ _bfd_error_handler
("%s: relocatable link from %s to %s not supported",
bfd_get_filename (abfd),
sub->xvec->name, abfd->xvec->name);
diff --git a/bfd/pe-mips.c b/bfd/pe-mips.c
index 1dd8587..5b62a52 100644
--- a/bfd/pe-mips.c
+++ b/bfd/pe-mips.c
@@ -605,7 +605,7 @@ coff_pe_mips_relocate_section (bfd *output_bfd,
if (bfd_link_relocatable (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `ld -r' not supported with PE MIPS objects\n"), input_bfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;
@@ -715,8 +715,8 @@ coff_pe_mips_relocate_section (bfd *output_bfd,
mem = pointer to memory we're fixing up
val = VMA of what we need to refer to. */
-#define UI(x) (*_bfd_error_handler) (_("%B: unimplemented %s\n"), \
- input_bfd, x); \
+#define UI(x) _bfd_error_handler (_("%B: unimplemented %s\n"), \
+ input_bfd, x); \
bfd_set_error (bfd_error_bad_value);
switch (rel->r_type)
@@ -741,7 +741,7 @@ coff_pe_mips_relocate_section (bfd *output_bfd,
targ = val + (tmp & 0x03ffffff) * 4;
if ((src & 0xf0000000) != (targ & 0xf0000000))
{
- (*_bfd_error_handler) (_("%B: jump too far away\n"), input_bfd);
+ _bfd_error_handler (_("%B: jump too far away\n"), input_bfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -767,8 +767,8 @@ coff_pe_mips_relocate_section (bfd *output_bfd,
targ = val + low + ((tmp & 0xffff) << 16);
break;
default:
- (*_bfd_error_handler) (_("%B: bad pair/reflo after refhi\n"),
- input_bfd);
+ _bfd_error_handler (_("%B: bad pair/reflo after refhi\n"),
+ input_bfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index d713d96..fba31de 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -527,7 +527,7 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
/* PR 17512: Corrupt PE binaries can cause seg-faults. */
if (a->NumberOfRvaAndSizes > IMAGE_NUMBEROF_DIRECTORY_ENTRIES)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: aout header specifies an invalid number of data-directory entries: %d"),
abfd, a->NumberOfRvaAndSizes);
bfd_set_error (bfd_error_bad_value);
@@ -1084,9 +1084,9 @@ _bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
H_PUT_16 (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno);
else
{
- (*_bfd_error_handler) (_("%s: line number overflow: 0x%lx > 0xffff"),
- bfd_get_filename (abfd),
- scnhdr_int->s_nlnno);
+ _bfd_error_handler (_("%s: line number overflow: 0x%lx > 0xffff"),
+ bfd_get_filename (abfd),
+ scnhdr_int->s_nlnno);
bfd_set_error (bfd_error_file_truncated);
H_PUT_16 (abfd, 0xffff, scnhdr_ext->s_nlnno);
ret = 0;
diff --git a/bfd/pef.c b/bfd/pef.c
index 30c3179..f7aa58c 100644
--- a/bfd/pef.c
+++ b/bfd/pef.c
@@ -522,8 +522,8 @@ bfd_pef_scan (bfd *abfd,
bfd_pef_convert_architecture (header->architecture, &cputype, &cpusubtype);
if (cputype == bfd_arch_unknown)
{
- (*_bfd_error_handler) (_("bfd_pef_scan: unknown architecture 0x%lx"),
- header->architecture);
+ _bfd_error_handler (_("bfd_pef_scan: unknown architecture 0x%lx"),
+ header->architecture);
return -1;
}
bfd_set_arch_mach (abfd, cputype, cpusubtype);
diff --git a/bfd/plugin.c b/bfd/plugin.c
index 3931d27..2b0b8f0 100644
--- a/bfd/plugin.c
+++ b/bfd/plugin.c
@@ -218,7 +218,7 @@ try_load_plugin (const char *pname, bfd *abfd, int *has_plugin_p)
plugin_handle = dlopen (pname, RTLD_NOW);
if (!plugin_handle)
{
- (*_bfd_error_handler)("%s\n", dlerror ());
+ _bfd_error_handler ("%s\n", dlerror ());
return 0;
}
diff --git a/bfd/reloc.c b/bfd/reloc.c
index a2bfe2b..dbaa6a9 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -7874,7 +7874,7 @@ bfd_generic_lookup_section_flags (struct bfd_link_info *info ATTRIBUTE_UNUSED,
{
if (flaginfo != NULL)
{
- (*_bfd_error_handler) (_("INPUT_SECTION_FLAGS are not supported.\n"));
+ _bfd_error_handler (_("INPUT_SECTION_FLAGS are not supported.\n"));
return FALSE;
}
return TRUE;
diff --git a/bfd/rs6000-core.c b/bfd/rs6000-core.c
index 0f0fcdc..6ee78b3 100644
--- a/bfd/rs6000-core.c
+++ b/bfd/rs6000-core.c
@@ -468,8 +468,8 @@ rs6000coff_core_p (bfd *abfd)
/* Issue warning if the core file was truncated during writing. */
if (c_flag & CORE_TRUNC)
- (*_bfd_error_handler) (_("%s: warning core file truncated"),
- bfd_get_filename (abfd));
+ _bfd_error_handler (_("%s: warning core file truncated"),
+ bfd_get_filename (abfd));
/* Allocate core file header. */
#ifndef BFD64
diff --git a/bfd/sco5-core.c b/bfd/sco5-core.c
index 022a0b2..e3052fc 100644
--- a/bfd/sco5-core.c
+++ b/bfd/sco5-core.c
@@ -286,8 +286,8 @@ sco5_core_file_p (bfd *abfd)
secname = NULL; /* Ignore these */
break;
default:
- (*_bfd_error_handler) ("Unhandled SCO core file section type %d\n",
- chead.cs_stype);
+ _bfd_error_handler ("Unhandled SCO core file section type %d\n",
+ chead.cs_stype);
continue;
}
diff --git a/bfd/som.c b/bfd/som.c
index 635727c..9e1f341 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -5779,7 +5779,7 @@ static int
som_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
struct bfd_link_info *info ATTRIBUTE_UNUSED)
{
- (*_bfd_error_handler) (_("som_sizeof_headers unimplemented"));
+ _bfd_error_handler (_("som_sizeof_headers unimplemented"));
abort ();
return 0;
}
diff --git a/bfd/sparclinux.c b/bfd/sparclinux.c
index 161640c..e7a7b95 100644
--- a/bfd/sparclinux.c
+++ b/bfd/sparclinux.c
@@ -409,14 +409,14 @@ linux_tally_symbols (struct linux_link_hash_entry *h, void * data)
alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
if (p == NULL || alloc == NULL)
- (*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
- name);
+ _bfd_error_handler (_("Output file requires shared library `%s'\n"),
+ name);
else
{
strcpy (alloc, name);
p = strrchr (alloc, '_');
*p++ = '\0';
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Output file requires shared library `%s.so.%s'\n"),
alloc, p);
free (alloc);
@@ -603,7 +603,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
if (f->h->root.root.type != bfd_link_hash_defined
&& f->h->root.root.type != bfd_link_hash_defweak)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
f->h->root.root.root.string);
continue;
@@ -653,7 +653,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
if (f->h->root.root.type != bfd_link_hash_defined
&& f->h->root.root.type != bfd_link_hash_defweak)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
f->h->root.root.root.string);
continue;
@@ -678,7 +678,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
if (linux_hash_table (info)->fixup_count != fixups_written)
{
- (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
+ _bfd_error_handler (_("Warning: fixup count mismatch\n"));
while (linux_hash_table (info)->fixup_count > fixups_written)
{
bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
diff --git a/bfd/srec.c b/bfd/srec.c
index 5fdd68b..a013f9b 100644
--- a/bfd/srec.c
+++ b/bfd/srec.c
@@ -255,7 +255,7 @@ srec_bad_byte (bfd *abfd,
buf[0] = c;
buf[1] = '\0';
}
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%d: Unexpected character `%s' in S-record file\n"),
abfd, lineno, buf);
bfd_set_error (bfd_error_bad_value);
@@ -483,8 +483,8 @@ srec_scan (bfd *abfd)
min_bytes = 5;
if (bytes < min_bytes)
{
- (*_bfd_error_handler) (_("%B:%d: byte count %d too small\n"),
- abfd, lineno, bytes);
+ _bfd_error_handler (_("%B:%d: byte count %d too small\n"),
+ abfd, lineno, bytes);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
@@ -574,7 +574,7 @@ srec_scan (bfd *abfd)
check_sum = 255 - (check_sum & 0xff);
if (check_sum != HEX (data))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%d: Bad checksum in S-record file\n"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -607,7 +607,7 @@ srec_scan (bfd *abfd)
check_sum = 255 - (check_sum & 0xff);
if (check_sum != HEX (data))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%d: Bad checksum in S-record file\n"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/stabs.c b/bfd/stabs.c
index 8049bb0..deb2c0f 100644
--- a/bfd/stabs.c
+++ b/bfd/stabs.c
@@ -274,7 +274,7 @@ _bfd_link_section_stabs (bfd *abfd,
symstroff = stroff + bfd_get_32 (abfd, sym + STRDXOFF);
if (symstroff >= stabstrsec->size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A+0x%lx): Stabs entry has invalid string index."),
abfd, stabsec, (long) (sym - stabbuf));
bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/syms.c b/bfd/syms.c
index 5a22c0b..6f05ee5 100644
--- a/bfd/syms.c
+++ b/bfd/syms.c
@@ -1075,7 +1075,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
|| r->howto->bitpos != 0
|| r->howto->dst_mask != 0xffffffff)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Unsupported .stab relocation"));
bfd_set_error (bfd_error_invalid_operation);
if (reloc_vector != NULL)
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c
index b00ab2a..6b37e45 100644
--- a/bfd/vms-alpha.c
+++ b/bfd/vms-alpha.c
@@ -1314,7 +1314,7 @@ _bfd_vms_slurp_egsd (bfd *abfd)
case EGSD__C_SYMM:
case EGSD__C_SYMV:
default:
- (*_bfd_error_handler) (_("Unknown EGSD subtype %d"), gsd_type);
+ _bfd_error_handler (_("Unknown EGSD subtype %d"), gsd_type);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -1345,7 +1345,7 @@ _bfd_vms_push (bfd *abfd, bfd_vma val, unsigned int reloc)
if (PRIV (stackptr) >= STACKSIZE)
{
bfd_set_error (bfd_error_bad_value);
- (*_bfd_error_handler) (_("Stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr));
+ _bfd_error_handler (_("Stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr));
exit (1);
}
}
@@ -1358,7 +1358,7 @@ _bfd_vms_pop (bfd *abfd, bfd_vma *val, unsigned int *rel)
if (PRIV (stackptr) == 0)
{
bfd_set_error (bfd_error_bad_value);
- (*_bfd_error_handler) (_("Stack underflow in _bfd_vms_pop"));
+ _bfd_error_handler (_("Stack underflow in _bfd_vms_pop"));
exit (1);
}
PRIV (stackptr)--;
@@ -1595,7 +1595,7 @@ _bfd_vms_etir_name (int cmd)
default:
/* These names have not yet been added to this switch statement. */
- (*_bfd_error_handler) (_("unknown ETIR command %d"), cmd);
+ _bfd_error_handler (_("unknown ETIR command %d"), cmd);
}
return NULL;
@@ -1781,8 +1781,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
psect = bfd_getl32 (ptr);
if ((unsigned int) psect >= PRIV (section_count))
{
- (*_bfd_error_handler) (_("bad section index in %s"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("bad section index in %s"),
+ _bfd_vms_etir_name (cmd));
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -1794,8 +1794,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
case ETIR__C_STA_LI:
case ETIR__C_STA_MOD:
case ETIR__C_STA_CKARG:
- (*_bfd_error_handler) (_("unsupported STA cmd %s"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("unsupported STA cmd %s"),
+ _bfd_vms_etir_name (cmd));
return FALSE;
break;
@@ -1970,14 +1970,14 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
case ETIR__C_STO_RB:
case ETIR__C_STO_AB:
case ETIR__C_STO_LP_PSB:
- (*_bfd_error_handler) (_("%s: not supported"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("%s: not supported"),
+ _bfd_vms_etir_name (cmd));
return FALSE;
break;
case ETIR__C_STO_HINT_GBL:
case ETIR__C_STO_HINT_PS:
- (*_bfd_error_handler) (_("%s: not implemented"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("%s: not implemented"),
+ _bfd_vms_etir_name (cmd));
return FALSE;
break;
@@ -2001,8 +2001,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
lw psect index
qw offset. */
case ETIR__C_STC_PS:
- (*_bfd_error_handler) (_("%s: not supported"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("%s: not supported"),
+ _bfd_vms_etir_name (cmd));
return FALSE;
break;
@@ -2092,8 +2092,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
/* 214 Store-conditional NOP, BSR or HINT at psect + offset
arg: none. */
case ETIR__C_STC_NBH_PS:
- (*_bfd_error_handler) ("%s: not supported",
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler ("%s: not supported",
+ _bfd_vms_etir_name (cmd));
return FALSE;
break;
@@ -2232,8 +2232,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
if (rel1 != RELC_NONE || rel2 != RELC_NONE)
{
bad_context:
- (*_bfd_error_handler) (_("invalid use of %s with contexts"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("invalid use of %s with contexts"),
+ _bfd_vms_etir_name (cmd));
return FALSE;
}
if ((int)op2 < 0) /* Shift right. */
@@ -2248,8 +2248,8 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
case ETIR__C_OPR_ROT: /* Rotate. */
case ETIR__C_OPR_REDEF: /* Redefine symbol to current location. */
case ETIR__C_OPR_DFLIT: /* Define a literal. */
- (*_bfd_error_handler) (_("%s: not supported"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("%s: not supported"),
+ _bfd_vms_etir_name (cmd));
return FALSE;
break;
@@ -2266,7 +2266,7 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
break;
default:
- (*_bfd_error_handler) (_("reserved cmd %d"), cmd);
+ _bfd_error_handler (_("reserved cmd %d"), cmd);
return FALSE;
break;
}
@@ -2351,7 +2351,7 @@ _bfd_vms_slurp_eeom (bfd *abfd)
PRIV (eom_data).eom_w_comcod = bfd_getl16 (eeom->comcod);
if (PRIV (eom_data).eom_w_comcod > 1)
{
- (*_bfd_error_handler) (_("Object module NOT error-free !\n"));
+ _bfd_error_handler (_("Object module NOT error-free !\n"));
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@ -3671,7 +3671,7 @@ _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
unsigned int irel;
if (section->reloc_count == 0)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("SEC_RELOC with no relocs in section %s"), section->name);
#if VMS_DEBUG
@@ -3724,8 +3724,8 @@ _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
/* Regular relocs are intertwined with binary data. */
if (curr_addr > addr)
- (*_bfd_error_handler) (_("Size error in section %s"),
- section->name);
+ _bfd_error_handler (_("Size error in section %s"),
+ section->name);
size = addr - curr_addr;
sto_imm (abfd, section, size, curr_data, curr_addr);
curr_data += size;
@@ -3883,7 +3883,7 @@ _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
break;
case ALPHA_R_BSR:
- (*_bfd_error_handler) (_("Spurious ALPHA_R_BSR reloc"));
+ _bfd_error_handler (_("Spurious ALPHA_R_BSR reloc"));
break;
case ALPHA_R_LDA:
@@ -3924,8 +3924,8 @@ _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
break;
default:
- (*_bfd_error_handler) (_("Unhandled relocation %s"),
- rptr->howto->name);
+ _bfd_error_handler (_("Unhandled relocation %s"),
+ rptr->howto->name);
break;
}
@@ -3937,8 +3937,8 @@ _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
{
/* Output rest of section. */
if (curr_addr > section->size)
- (*_bfd_error_handler) (_("Size error in section %s"),
- section->name);
+ _bfd_error_handler (_("Size error in section %s"),
+ section->name);
size = section->size - curr_addr;
sto_imm (abfd, section, size, curr_data, curr_addr);
curr_data += size;
@@ -4214,8 +4214,8 @@ parse_module (bfd *abfd, struct module *module, unsigned char *ptr,
break;
default:
- (*_bfd_error_handler) (_("unknown source command %d"),
- cmd);
+ _bfd_error_handler (_("unknown source command %d"),
+ cmd);
cmd_length = 2;
break;
}
@@ -4274,31 +4274,31 @@ parse_module (bfd *abfd, struct module *module, unsigned char *ptr,
break;
case DST__K_SET_LINUM_INCR:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_SET_LINUM_INCR not implemented"));
cmd_length = 2;
break;
case DST__K_SET_LINUM_INCR_W:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_SET_LINUM_INCR_W not implemented"));
cmd_length = 3;
break;
case DST__K_RESET_LINUM_INCR:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_RESET_LINUM_INCR not implemented"));
cmd_length = 1;
break;
case DST__K_BEG_STMT_MODE:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_BEG_STMT_MODE not implemented"));
cmd_length = 1;
break;
case DST__K_END_STMT_MODE:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_END_STMT_MODE not implemented"));
cmd_length = 1;
break;
@@ -4325,25 +4325,25 @@ parse_module (bfd *abfd, struct module *module, unsigned char *ptr,
break;
case DST__K_SET_PC:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_SET_PC not implemented"));
cmd_length = 2;
break;
case DST__K_SET_PC_W:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_SET_PC_W not implemented"));
cmd_length = 3;
break;
case DST__K_SET_PC_L:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_SET_PC_L not implemented"));
cmd_length = 5;
break;
case DST__K_SET_STMTNUM:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("DST__K_SET_STMTNUM not implemented"));
cmd_length = 2;
break;
@@ -4387,8 +4387,7 @@ parse_module (bfd *abfd, struct module *module, unsigned char *ptr,
}
else
{
- (*_bfd_error_handler) (_("unknown line command %d"),
- cmd);
+ _bfd_error_handler (_("unknown line command %d"), cmd);
cmd_length = 2;
}
break;
@@ -4846,7 +4845,7 @@ alpha_vms_slurp_relocs (bfd *abfd)
case ETIR__C_CTL_SETRB:
if (prev_cmd != ETIR__C_STA_PQ)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd),
_bfd_vms_etir_name (cmd));
return FALSE;
@@ -4863,7 +4862,7 @@ alpha_vms_slurp_relocs (bfd *abfd)
{
if (prev_cmd != ETIR__C_STA_GBL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
_bfd_vms_etir_name (ETIR__C_STA_LW));
return FALSE;
@@ -4877,7 +4876,7 @@ alpha_vms_slurp_relocs (bfd *abfd)
/* ALPHA_R_REFQUAD und_section, step 2 */
if (prev_cmd != -1 && prev_cmd != ETIR__C_STA_GBL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
_bfd_vms_etir_name (ETIR__C_STA_QW));
return FALSE;
@@ -4893,9 +4892,9 @@ alpha_vms_slurp_relocs (bfd *abfd)
&& prev_cmd != ETIR__C_STA_LW
&& prev_cmd != ETIR__C_STA_PQ)
{
- (*_bfd_error_handler) (_("Unknown reloc %s + %s"),
- _bfd_vms_etir_name (prev_cmd),
- _bfd_vms_etir_name (ETIR__C_STO_LW));
+ _bfd_error_handler (_("Unknown reloc %s + %s"),
+ _bfd_vms_etir_name (prev_cmd),
+ _bfd_vms_etir_name (ETIR__C_STO_LW));
return FALSE;
}
reloc_code = BFD_RELOC_32;
@@ -4905,9 +4904,9 @@ alpha_vms_slurp_relocs (bfd *abfd)
/* ALPHA_R_REFQUAD abs_section, step 2 */
if (prev_cmd != ETIR__C_OPR_ADD && prev_cmd != ETIR__C_STA_QW)
{
- (*_bfd_error_handler) (_("Unknown reloc %s + %s"),
- _bfd_vms_etir_name (prev_cmd),
- _bfd_vms_etir_name (ETIR__C_STO_QW));
+ _bfd_error_handler (_("Unknown reloc %s + %s"),
+ _bfd_vms_etir_name (prev_cmd),
+ _bfd_vms_etir_name (ETIR__C_STO_QW));
return FALSE;
}
reloc_code = BFD_RELOC_64;
@@ -4916,9 +4915,9 @@ alpha_vms_slurp_relocs (bfd *abfd)
case ETIR__C_STO_OFF: /* ALPHA_R_REFQUAD others, step 2 */
if (prev_cmd != ETIR__C_STA_PQ)
{
- (*_bfd_error_handler) (_("Unknown reloc %s + %s"),
- _bfd_vms_etir_name (prev_cmd),
- _bfd_vms_etir_name (ETIR__C_STO_OFF));
+ _bfd_error_handler (_("Unknown reloc %s + %s"),
+ _bfd_vms_etir_name (prev_cmd),
+ _bfd_vms_etir_name (ETIR__C_STO_OFF));
return FALSE;
}
reloc_code = BFD_RELOC_64;
@@ -4928,9 +4927,9 @@ alpha_vms_slurp_relocs (bfd *abfd)
/* ALPHA_R_REFQUAD und_section, step 3 */
if (prev_cmd != ETIR__C_STA_LW && prev_cmd != ETIR__C_STA_QW)
{
- (*_bfd_error_handler) (_("Unknown reloc %s + %s"),
- _bfd_vms_etir_name (prev_cmd),
- _bfd_vms_etir_name (ETIR__C_OPR_ADD));
+ _bfd_error_handler (_("Unknown reloc %s + %s"),
+ _bfd_vms_etir_name (prev_cmd),
+ _bfd_vms_etir_name (ETIR__C_OPR_ADD));
return FALSE;
}
prev_cmd = ETIR__C_OPR_ADD;
@@ -4983,8 +4982,8 @@ alpha_vms_slurp_relocs (bfd *abfd)
continue;
default:
- (*_bfd_error_handler) (_("Unknown reloc %s"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("Unknown reloc %s"),
+ _bfd_vms_etir_name (cmd));
return FALSE;
}
@@ -4996,14 +4995,14 @@ alpha_vms_slurp_relocs (bfd *abfd)
/* Get section to which the relocation applies. */
if (cur_psect < 0 || cur_psect > (int)PRIV (section_count))
{
- (*_bfd_error_handler) (_("Invalid section index in ETIR"));
+ _bfd_error_handler (_("Invalid section index in ETIR"));
return FALSE;
}
sec = PRIV (sections)[cur_psect];
if (sec == bfd_abs_section_ptr)
{
- (*_bfd_error_handler) (_("Relocation for non-REL psect"));
+ _bfd_error_handler (_("Relocation for non-REL psect"));
return FALSE;
}
@@ -5050,8 +5049,8 @@ alpha_vms_slurp_relocs (bfd *abfd)
}
if (sym == NULL)
{
- (*_bfd_error_handler) (_("Unknown symbol in command %s"),
- _bfd_vms_etir_name (cmd));
+ _bfd_error_handler (_("Unknown symbol in command %s"),
+ _bfd_vms_etir_name (cmd));
reloc->sym_ptr_ptr = NULL;
}
else
@@ -5451,7 +5450,7 @@ alpha_vms_bfd_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
case BFD_RELOC_ALPHA_LDA: alpha_type = ALPHA_R_LDA; break;
case BFD_RELOC_ALPHA_BOH: alpha_type = ALPHA_R_BOH; break;
default:
- (*_bfd_error_handler) ("reloc (%d) is *UNKNOWN*", code);
+ _bfd_error_handler ("reloc (%d) is *UNKNOWN*", code);
return NULL;
}
vms_debug2 ((2, "reloc is %s\n", alpha_howto_table[alpha_type].name));
diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c
index 863b915..eef0945 100644
--- a/bfd/vms-lib.c
+++ b/bfd/vms-lib.c
@@ -1441,8 +1441,8 @@ _bfd_vms_lib_get_imagelib_file (bfd *el)
if (res == NULL)
{
- (*_bfd_error_handler)(_("could not open shared image '%s' from '%s'"),
- filename, archive->filename);
+ _bfd_error_handler(_("could not open shared image '%s' from '%s'"),
+ filename, archive->filename);
bfd_release (archive, filename);
return NULL;
}
diff --git a/bfd/vms-misc.c b/bfd/vms-misc.c
index 94a13c7..5fdce50 100644
--- a/bfd/vms-misc.c
+++ b/bfd/vms-misc.c
@@ -356,12 +356,12 @@ _bfd_vms_output_counted (struct vms_rec_wr *recwr, const char *value)
len = strlen (value);
if (len == 0)
{
- (*_bfd_error_handler) (_("_bfd_vms_output_counted called with zero bytes"));
+ _bfd_error_handler (_("_bfd_vms_output_counted called with zero bytes"));
return;
}
if (len > 255)
{
- (*_bfd_error_handler) (_("_bfd_vms_output_counted called with too many bytes"));
+ _bfd_error_handler (_("_bfd_vms_output_counted called with too many bytes"));
return;
}
_bfd_vms_output_byte (recwr, (unsigned int) len & 0xff);
diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
index d3653e3..20e9b8c 100644
--- a/bfd/xcofflink.c
+++ b/bfd/xcofflink.c
@@ -828,7 +828,7 @@ xcoff_link_add_dynamic_symbols (bfd *abfd, struct bfd_link_info *info)
output file. */
if (info->output_bfd->xvec != abfd->xvec)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: XCOFF shared object when not producing XCOFF output"),
bfd_get_filename (abfd));
bfd_set_error (bfd_error_invalid_operation);
@@ -849,7 +849,7 @@ xcoff_link_add_dynamic_symbols (bfd *abfd, struct bfd_link_info *info)
lsec = bfd_get_section_by_name (abfd, ".loader");
if (lsec == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: dynamic object with no .loader section"),
bfd_get_filename (abfd));
bfd_set_error (bfd_error_no_symbols);
@@ -1408,7 +1408,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
enclosing = xcoff_section_data (abfd, csect)->enclosing;
if (enclosing == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' has line numbers but no enclosing section"),
abfd, name);
bfd_set_error (bfd_error_bad_value);
@@ -1460,7 +1460,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
/* Pick up the csect auxiliary information. */
if (sym.n_numaux == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: class %d symbol `%s' has no aux entries"),
abfd, sym.n_sclass, name);
bfd_set_error (bfd_error_bad_value);
@@ -1482,7 +1482,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
switch (smtyp)
{
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: symbol `%s' has unrecognized csect type %d"),
abfd, name, smtyp);
bfd_set_error (bfd_error_bad_value);
@@ -1494,7 +1494,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
|| sym.n_scnum != N_UNDEF
|| aux.x_csect.x_scnlen.l != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"),
abfd, name, sym.n_sclass, sym.n_scnum,
aux.x_csect.x_scnlen.l);
@@ -1523,7 +1523,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
if (sym.n_sclass != C_HIDEXT
|| aux.x_csect.x_scnlen.l != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: XMC_TC0 symbol `%s' is class %d scnlen %d"),
abfd, name, sym.n_sclass, aux.x_csect.x_scnlen.l);
bfd_set_error (bfd_error_bad_value);
@@ -1669,7 +1669,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
|| ((bfd_vma) sym.n_value + aux.x_csect.x_scnlen.l
> enclosing->vma + enclosing->size)))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: csect `%s' not in enclosing section"),
abfd, name);
bfd_set_error (bfd_error_bad_value);
@@ -1776,7 +1776,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
}
if (bad)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: misplaced XTY_LD `%s'"),
abfd, name);
bfd_set_error (bfd_error_bad_value);
@@ -2096,7 +2096,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
{
if (*rel_csect == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: reloc %s:%d not in csect"),
abfd, o->name, i);
bfd_set_error (bfd_error_bad_value);
@@ -3187,7 +3187,7 @@ bfd_xcoff_link_count_reloc (bfd *output_bfd,
FALSE));
if (h == NULL)
{
- (*_bfd_error_handler) (_("%s: no such symbol"), name);
+ _bfd_error_handler (_("%s: no such symbol"), name);
bfd_set_error (bfd_error_no_symbols);
return FALSE;
}
@@ -3291,7 +3291,7 @@ xcoff_build_ldsym (struct xcoff_loader_info *ldinfo,
if ((h->flags & XCOFF_EXPORT) != 0
&& (h->flags & XCOFF_WAS_UNDEFINED) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("warning: attempt to export undefined symbol `%s'"),
h->root.root.string);
return TRUE;
@@ -3670,7 +3670,7 @@ bfd_xcoff_size_dynamic_sections (bfd *output_bfd,
"__rtinit", FALSE, FALSE, TRUE);
if (hsym == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("error: undefined symbol __rtinit"));
return FALSE;
}
@@ -4049,7 +4049,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo,
ldrel.l_symndx = 2;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: loader reloc in unrecognized section `%s'"),
reference_bfd, secname);
bfd_set_error (bfd_error_nonrepresentable_section);
@@ -4060,7 +4060,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo,
{
if (h->ldindx < 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: `%s' in loader reloc but not loader sym"),
reference_bfd, h->root.root.string);
bfd_set_error (bfd_error_bad_value);
@@ -4076,7 +4076,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo,
if (xcoff_hash_table (flinfo->info)->textro
&& strcmp (output_section->name, ".text") == 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: loader reloc in read-only section %A"),
reference_bfd, output_section);
bfd_set_error (bfd_error_invalid_operation);
@@ -5100,7 +5100,7 @@ xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *flinfo)
/* Make sure that the start of the TOC is also within range. */
if (best_address > toc_start + 0x8000)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("TOC overflow: 0x%lx > 0x10000; try -mminimal-toc "
"when compiling"),
(unsigned long) (toc_end - toc_start));
--
Alan Modra
Australia Development Lab, IBM