summaryrefslogtreecommitdiff
path: root/bfd/elf32-cris.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2016-09-30 13:00:18 +0930
committerAlan Modra <amodra@gmail.com>2016-09-30 15:17:44 +0930
commit4eca02287cf48e60ee89338ddd35f8d0d8257a51 (patch)
tree8ca78e581fa1260b8a1073e7e1a92d46e8bfabf6 /bfd/elf32-cris.c
parent4519d071387f374932616b588ddb4ec8cabe2a52 (diff)
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.
Diffstat (limited to 'bfd/elf32-cris.c')
-rw-r--r--bfd/elf32-cris.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index e759745d43..1722b75b63 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1170,7 +1170,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
|| (!h->def_dynamic
&& h->root.type == bfd_link_hash_undefweak)))))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((h->got.offset == (bfd_vma) -1)
? _("%B, section %A: No PLT nor GOT for relocation %s"
" against symbol `%s'")
@@ -1298,7 +1298,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
symbols. Make this an error; the compiler isn't
allowed to pass us these kinds of things. */
if (h == NULL)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against local symbol"),
input_bfd,
@@ -1306,7 +1306,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
cris_elf_howto_table[r_type].name,
rel->r_addend);
else
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against symbol `%s'"),
input_bfd,
@@ -1332,7 +1332,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
|| (!h->def_dynamic
&& h->root.type == bfd_link_hash_undefweak))))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s is"
" not allowed for global symbol: `%s'"),
input_bfd,
@@ -1348,7 +1348,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
it's noticed if it happens elsewhere. */
if (sgot == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with no GOT created"),
input_bfd,
input_section,
@@ -1561,7 +1561,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
|| (!h->def_regular
&& h->root.type != bfd_link_hash_undefined)))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((h->root.type == bfd_link_hash_undefined)
/* We shouldn't get here for GCC-emitted code. */
? _("%B, section %A: relocation %s has an undefined"
@@ -1649,7 +1649,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
symbol *plus offset*. The GOT holds relocations for
symbols. Make this an error; the compiler isn't allowed
to pass us these kinds of things. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against symbol `%s'"),
input_bfd,
@@ -1802,7 +1802,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
relocations for symbols. Make this an error; the
compiler isn't allowed to pass us these kinds of
things. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s with non-zero addend %d"
" against symbol `%s'"),
input_bfd,
@@ -1936,7 +1936,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
been emitted. */
&& h->root.type != bfd_link_hash_undefined)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A: relocation %s is"
" not allowed for symbol: `%s'"
" which is defined outside the program,"
@@ -1989,14 +1989,14 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
only. */
case R_CRIS_16_GOT_TPREL:
case R_CRIS_16_GOT_GD:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("(too many global variables for -fpic:"
" recompile with -fPIC)"));
break;
case R_CRIS_16_TPREL:
case R_CRIS_16_DTPREL:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("(thread-local data too big for -fpic or"
" -msmall-tls: recompile with -fPIC or"
" -mno-small-tls)"));
@@ -3228,7 +3228,7 @@ cris_elf_check_relocs (bfd *abfd,
that, we must insist on dynobj being a specific mach. */
if (bfd_get_mach (dynobj) == bfd_mach_cris_v10_v32)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A:\n v10/v32 compatible object %s"
" must not contain a PIC relocation"),
abfd, sec);
@@ -3336,7 +3336,7 @@ cris_elf_check_relocs (bfd *abfd,
case R_CRIS_32_GD:
if (bfd_link_pic (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A:\n relocation %s not valid"
" in a shared object;"
" typically an option mixup, recompile with -fPIC"),
@@ -3550,7 +3550,7 @@ cris_elf_check_relocs (bfd *abfd,
&& (sec->flags & SEC_READONLY) != 0)
{
/* FIXME: How do we make this optionally a warning only? */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section %A:\n relocation %s should not"
" be used in a shared object; recompile with -fPIC"),
abfd,
@@ -3972,7 +3972,7 @@ elf_cris_discard_excess_dso_dynamics (struct elf_cris_link_hash_entry *h,
if ((s->section->flags & SEC_READONLY) != 0)
{
/* FIXME: How do we make this optionally a warning only? */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B, section `%A', to symbol `%s':\n"
" relocation %s should not be used"
" in a shared object; recompile with -fPIC"),
@@ -4186,7 +4186,7 @@ cris_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (bfd_get_symbol_leading_char (ibfd)
!= bfd_get_symbol_leading_char (obfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(bfd_get_symbol_leading_char (ibfd) == '_'
? _("%B: uses _-prefixed symbols, but writing file with non-prefixed symbols")
: _("%B: uses non-prefixed symbols, but writing file with _-prefixed symbols"),
@@ -4206,7 +4206,7 @@ cris_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
|| (omach == bfd_mach_cris_v32
&& imach != bfd_mach_cris_v10_v32))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
((imach == bfd_mach_cris_v32)
? _("%B contains CRIS v32 code, incompatible"
" with previous objects")