From 4eca02287cf48e60ee89338ddd35f8d0d8257a51 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 30 Sep 2016 13:00:18 +0930 Subject: 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. --- bfd/elf32-arm.c | 222 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 110 insertions(+), 112 deletions(-) (limited to 'bfd/elf32-arm.c') 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; } -- cgit v1.1