This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Remove syntactic sugar
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 30 Sep 2016 08:16:10 -0000
- Subject: [binutils-gdb] Remove syntactic sugar
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4eca02287cf48e60ee89338ddd35f8d0d8257a51
commit 4eca02287cf48e60ee89338ddd35f8d0d8257a51
Author: Alan Modra <amodra@gmail.com>
Date: Fri Sep 30 13:00:18 2016 +0930
Remove syntactic sugar
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:
---
bfd/ChangeLog | 33 ++++++++
bfd/aout-adobe.c | 2 +-
bfd/aout-cris.c | 10 +--
bfd/aoutx.h | 11 +--
bfd/archive.c | 4 +-
bfd/bfd.c | 8 +-
bfd/binary.c | 5 +-
bfd/cache.c | 4 +-
bfd/coff-alpha.c | 10 +--
bfd/coff-arm.c | 2 +-
bfd/coff-h8300.c | 2 +-
bfd/coff-i860.c | 4 +-
bfd/coff-mcore.c | 2 +-
bfd/coff-ppc.c | 29 +++----
bfd/coff-rs6000.c | 6 +-
bfd/coff-sh.c | 58 ++++++-------
bfd/coff-tic4x.c | 6 +-
bfd/coff-tic54x.c | 6 +-
bfd/coff-tic80.c | 6 +-
bfd/coff64-rs6000.c | 2 +-
bfd/coffcode.h | 30 +++----
bfd/coffgen.c | 8 +-
bfd/cofflink.c | 14 ++--
bfd/coffswap.h | 8 +-
bfd/cpu-arm.c | 2 +-
bfd/cpu-m68k.c | 2 +-
bfd/cpu-sh.c | 4 +-
bfd/dwarf2.c | 50 +++++------
bfd/ecoff.c | 2 +-
bfd/elf-eh-frame.c | 14 ++--
bfd/elf-m10300.c | 10 +--
bfd/elf.c | 85 +++++++++----------
bfd/elf32-arc.c | 18 ++--
bfd/elf32-arm.c | 222 ++++++++++++++++++++++++-------------------------
bfd/elf32-avr.c | 4 +-
bfd/elf32-bfin.c | 31 +++----
bfd/elf32-cr16.c | 4 +-
bfd/elf32-cris.c | 34 ++++----
bfd/elf32-crx.c | 4 +-
bfd/elf32-dlx.c | 10 ++-
bfd/elf32-frv.c | 17 ++--
bfd/elf32-hppa.c | 22 +++--
bfd/elf32-i370.c | 15 ++--
bfd/elf32-i386.c | 33 ++++----
bfd/elf32-lm32.c | 6 +-
bfd/elf32-m32c.c | 11 +--
bfd/elf32-m32r.c | 11 ++-
bfd/elf32-m68hc1x.c | 12 +--
bfd/elf32-m68k.c | 32 +++----
bfd/elf32-mcore.c | 4 +-
bfd/elf32-mep.c | 6 +-
bfd/elf32-metag.c | 9 +-
bfd/elf32-microblaze.c | 34 ++++----
bfd/elf32-mips.c | 2 +-
bfd/elf32-nds32.c | 106 +++++++++++------------
bfd/elf32-nios2.c | 16 ++--
bfd/elf32-or1k.c | 12 +--
bfd/elf32-pj.c | 4 +-
bfd/elf32-ppc.c | 26 +++---
bfd/elf32-rl78.c | 14 ++--
bfd/elf32-s390.c | 16 ++--
bfd/elf32-score.c | 12 +--
bfd/elf32-score7.c | 9 +-
bfd/elf32-sh.c | 130 ++++++++++++++---------------
bfd/elf32-sh64.c | 16 ++--
bfd/elf32-sparc.c | 4 +-
bfd/elf32-spu.c | 32 +++----
bfd/elf32-tic6x.c | 19 ++---
bfd/elf32-tilepro.c | 14 ++--
bfd/elf32-v850.c | 80 ++++++++++--------
bfd/elf32-vax.c | 12 +--
bfd/elf32-xtensa.c | 30 +++----
bfd/elf64-alpha.c | 48 +++++------
bfd/elf64-hppa.c | 8 +-
bfd/elf64-ia64-vms.c | 48 +++++------
bfd/elf64-mips.c | 2 +-
bfd/elf64-mmix.c | 25 +++---
bfd/elf64-ppc.c | 24 +++---
bfd/elf64-s390.c | 17 ++--
bfd/elf64-sh64.c | 14 ++--
bfd/elf64-sparc.c | 12 +--
bfd/elf64-x86-64.c | 40 ++++-----
bfd/elfcode.h | 4 +-
bfd/elfcore.h | 2 +-
bfd/elflink.c | 100 +++++++++++-----------
bfd/elfn32-mips.c | 2 +-
bfd/elfnn-aarch64.c | 37 ++++-----
bfd/elfnn-ia64.c | 40 ++++-----
bfd/elfxx-mips.c | 62 +++++++-------
bfd/elfxx-sparc.c | 14 ++--
bfd/elfxx-tilegx.c | 16 ++--
bfd/hpux-core.c | 2 +-
bfd/i386linux.c | 12 +--
bfd/ieee.c | 10 +--
bfd/ihex.c | 20 ++---
bfd/libbfd.c | 4 +-
bfd/linker.c | 6 +-
bfd/m68klinux.c | 12 +--
bfd/mach-o.c | 60 +++++++------
bfd/merge.c | 8 +-
bfd/mmo.c | 52 ++++++------
bfd/oasys.c | 2 +-
bfd/osf-core.c | 4 +-
bfd/pdp11.c | 8 +-
bfd/pe-mips.c | 12 +--
bfd/peXXigen.c | 8 +-
bfd/pef.c | 4 +-
bfd/plugin.c | 2 +-
bfd/reloc.c | 2 +-
bfd/rs6000-core.c | 4 +-
bfd/sco5-core.c | 4 +-
bfd/som.c | 2 +-
bfd/sparclinux.c | 12 +--
bfd/srec.c | 10 +--
bfd/stabs.c | 2 +-
bfd/syms.c | 2 +-
bfd/vms-alpha.c | 129 ++++++++++++++--------------
bfd/vms-lib.c | 4 +-
bfd/vms-misc.c | 4 +-
bfd/xcofflink.c | 34 ++++----
120 files changed, 1265 insertions(+), 1217 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 37333a3..08ddf83 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,38 @@
2016-09-30 Alan Modra <amodra@gmail.com>
+ * 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.
+
+2016-09-30 Alan Modra <amodra@gmail.com>
+
* bfd-in.h: Include stdarg.h.
* bfd.c (bfd_error_handler_type): Make like vprintf.
(_bfd_error_internal): Rename from _bfd_error_handler. Make static.
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 @@ cr[...]
[diff truncated at 100000 bytes]