aboutsummaryrefslogtreecommitdiff
path: root/bfd/elf32-nds32.c
diff options
context:
space:
mode:
Diffstat (limited to 'bfd/elf32-nds32.c')
-rw-r--r--bfd/elf32-nds32.c106
1 files changed, 54 insertions, 52 deletions
diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c
index 09d26ae..fc47c7f 100644
--- a/bfd/elf32-nds32.c
+++ b/bfd/elf32-nds32.c
@@ -3303,7 +3303,7 @@ nds32_elf_final_sda_base (bfd *output_bfd, struct bfd_link_info *info,
}
else
{
- (*_bfd_error_handler) (_("error: Can't find symbol: _SDA_BASE_."));
+ _bfd_error_handler (_("error: Can't find symbol: _SDA_BASE_."));
return bfd_reloc_dangerous;
}
}
@@ -4519,15 +4519,15 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
/* Set the _ITB_BASE_. */
if (!nds32_elf_ex9_itb_base (info))
{
- (*_bfd_error_handler) (_("%B: error: Cannot set _ITB_BASE_"),
- output_bfd);
+ _bfd_error_handler (_("%B: error: Cannot set _ITB_BASE_"),
+ output_bfd);
bfd_set_error (bfd_error_bad_value);
}
}
if (table->target_optimize & NDS32_RELAX_JUMP_IFC_ON)
if (!nds32_elf_ifc_reloc ())
- (*_bfd_error_handler) (_("error: IFC relocation error."));
+ _bfd_error_handler (_("error: IFC relocation error."));
/* Relocation for .ex9.itable. */
if (table->target_optimize & NDS32_RELAX_EX9_ON
@@ -4560,8 +4560,8 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
r_type = ELF32_R_TYPE (rel->r_info);
if (r_type >= R_NDS32_max)
{
- (*_bfd_error_handler) (_("%B: error: unknown relocation type %d."),
- input_bfd, r_type);
+ _bfd_error_handler (_("%B: error: unknown relocation type %d."),
+ input_bfd, r_type);
bfd_set_error (bfd_error_bad_value);
ret = FALSE;
continue;
@@ -5005,7 +5005,7 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
case R_NDS32_25_ABS_RELA:
if (bfd_link_pic (info))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: cannot deal R_NDS32_25_ABS_RELA in shared "
"mode."), bfd_get_filename (input_bfd));
return FALSE;
@@ -5139,7 +5139,7 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
if (relocation & align)
{
/* Incorrect alignment. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: unaligned access to GOT entry."), input_bfd);
ret = FALSE;
r = bfd_reloc_dangerous;
@@ -5181,7 +5181,7 @@ handle_sda:
r = nds32_elf_final_sda_base (output_bfd, info, &gp, FALSE);
if (r != bfd_reloc_ok)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: relocate SDA_BASE failed."), input_bfd);
ret = FALSE;
goto check_reloc;
@@ -5202,7 +5202,7 @@ handle_sda:
if (relocation & align)
{
/* Incorrect alignment. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B(%A): warning: unaligned small data access of type %d."),
input_bfd, input_section, r_type);
ret = FALSE;
@@ -5967,11 +5967,12 @@ nds32_check_vec_size (bfd *ibfd)
nds32_vec_size = (flag_t & 0x3);
else if (nds32_vec_size != (flag_t & 0x3))
{
- (*_bfd_error_handler) (_("%B: ISR vector size mismatch"
- " with previous modules, previous %u-byte, current %u-byte"),
- ibfd,
- nds32_vec_size == 1 ? 4 : nds32_vec_size == 2 ? 16 : 0xffffffff,
- (flag_t & 0x3) == 1 ? 4 : (flag_t & 0x3) == 2 ? 16 : 0xffffffff);
+ _bfd_error_handler
+ (_("%B: ISR vector size mismatch"
+ " with previous modules, previous %u-byte, current %u-byte"),
+ ibfd,
+ nds32_vec_size == 1 ? 4 : nds32_vec_size == 2 ? 16 : 0xffffffff,
+ (flag_t & 0x3) == 1 ? 4 : (flag_t & 0x3) == 2 ? 16 : 0xffffffff);
return FALSE;
}
else
@@ -6009,7 +6010,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (bfd_little_endian (ibfd) != bfd_little_endian (obfd))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Endian mismatch with previous modules."), ibfd);
bfd_set_error (bfd_error_bad_value);
@@ -6019,7 +6020,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
in_version = elf_elfheader (ibfd)->e_flags & EF_NDS32_ELF_VERSION;
if (in_version == E_NDS32_ELF_VER_1_2)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: warning: Older version of object file encountered, "
"Please recompile with current tool chain."), ibfd);
}
@@ -6097,7 +6098,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
/* Check flag compatibility. */
if ((in_flags & EF_NDS_ABI) != (out_flags & EF_NDS_ABI))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: error: ABI mismatch with previous modules."), ibfd);
bfd_set_error (bfd_error_bad_value);
@@ -6108,7 +6109,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
{
if (((in_flags & EF_NDS_ARCH) != E_N1_ARCH))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: error: Instruction set mismatch with previous modules."), ibfd);
bfd_set_error (bfd_error_bad_value);
@@ -6133,9 +6134,10 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
else
{
if (in_version != out_version)
- (*_bfd_error_handler) (_("%B: warning: Incompatible elf-versions %s and %s."),
- ibfd, nds32_elfver_strtab[out_version],
- nds32_elfver_strtab[in_version]);
+ _bfd_error_handler
+ (_("%B: warning: Incompatible elf-versions %s and %s."),
+ ibfd, nds32_elfver_strtab[out_version],
+ nds32_elfver_strtab[in_version]);
elf_elfheader (obfd)->e_flags = in_flags | out_flags
| (in_16regs & out_16regs) | (in_no_mac & out_no_mac)
@@ -8772,7 +8774,7 @@ done_adjust_diff:
if (blank_t2 && blank_t2->next
&& (blank_t2->offset > raddr
|| blank_t2->next->offset <= raddr))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: %s\n"), abfd,
"Error: search_nds32_elf_blank reports wrong node");
@@ -9081,7 +9083,7 @@ nds32_elf_relax_longcall1 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL1 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9163,7 +9165,7 @@ nds32_elf_relax_longcall2 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (i1_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL2 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9270,7 +9272,7 @@ nds32_elf_relax_longcall3 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL3 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9405,7 +9407,7 @@ nds32_elf_relax_longjump1 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_LO12S0_ORI_RELA, laddr + 4);
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP1 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9612,7 +9614,7 @@ nds32_elf_relax_longjump2 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (i2_irelfn == irelend || cond_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP2 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9805,7 +9807,7 @@ nds32_elf_relax_longjump3 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irelfn == irelend || lo_irelfn == irelend || cond_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP3 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -9986,7 +9988,7 @@ nds32_elf_relax_longcall4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL4 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10017,7 +10019,7 @@ nds32_elf_relax_longcall4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (ptr_irel == irelend || em_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL4 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10089,7 +10091,7 @@ nds32_elf_relax_longcall5 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_25_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL5 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10168,7 +10170,7 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (em_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10207,7 +10209,7 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_PTR_RESOLVED, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10257,7 +10259,7 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_PTR_RESOLVED, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10308,7 +10310,7 @@ nds32_elf_relax_longjump4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (hi_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP4 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10331,7 +10333,7 @@ nds32_elf_relax_longjump4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (ptr_irel == irelend || em_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP4 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10406,7 +10408,7 @@ nds32_elf_relax_longjump5 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_25_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP5 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10536,7 +10538,7 @@ nds32_elf_relax_longjump6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (em_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP6 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10707,7 +10709,7 @@ nds32_elf_relax_longjump7 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
R_NDS32_15_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LONGJUMP7 points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -10813,7 +10815,7 @@ nds32_elf_relax_loadstore (struct bfd_link_info *link_info, bfd *abfd,
if (hi_irelfn == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_LOADSTORE points to unrecognized"
"reloc at 0x%lx.", abfd, (long) irel->r_offset);
return FALSE;
@@ -11285,7 +11287,7 @@ nds32_elf_relax_ptr (bfd *abfd, asection *sec, Elf_Internal_Rela *irel,
if (re_irel == irelend)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
("%B: warning: R_NDS32_PTR points to unrecognized reloc at 0x%lx.",
abfd, (long) irel->r_offset);
return FALSE;
@@ -11906,7 +11908,7 @@ nds32_elf_pick_relax (bfd_boolean init, asection *sec, bfd_boolean *again,
break;
case NDS32_RELAX_JUMP_IFC_ROUND:
if (!nds32_elf_ifc_finish (link_info))
- (*_bfd_error_handler) (_("error: Jump IFC Fail."));
+ _bfd_error_handler (_("error: Jump IFC Fail."));
if (table->target_optimize & NDS32_RELAX_EX9_ON)
{
pass++;
@@ -11923,7 +11925,7 @@ nds32_elf_pick_relax (bfd_boolean init, asection *sec, bfd_boolean *again,
{
/* Do jump IFC optimization again. */
if (!nds32_elf_ifc_finish (link_info))
- (*_bfd_error_handler) (_("error: Jump IFC Fail."));
+ _bfd_error_handler (_("error: Jump IFC Fail."));
}
break;
default:
@@ -12034,7 +12036,7 @@ nds32_elf_relax_section (bfd *abfd, asection *sec,
/* Set the _ITB_BASE_. */
if (!nds32_elf_ex9_itb_base (link_info))
{
- (*_bfd_error_handler) (_("%B: error: Cannot set _ITB_BASE_"), abfd);
+ _bfd_error_handler (_("%B: error: Cannot set _ITB_BASE_"), abfd);
bfd_set_error (bfd_error_bad_value);
}
}
@@ -12779,7 +12781,7 @@ nds32_relax_fp_as_gp (struct bfd_link_info *link_info,
{
/* Begin of the region. */
if (begin_rel)
- (*_bfd_error_handler) (_("%B: Nested OMIT_FP in %A."), abfd, sec);
+ _bfd_error_handler (_("%B: Nested OMIT_FP in %A."), abfd, sec);
begin_rel = irel;
nds32_fag_init (&fag_head);
@@ -12797,7 +12799,7 @@ nds32_relax_fp_as_gp (struct bfd_link_info *link_info,
if (begin_rel == NULL)
{
- (*_bfd_error_handler) (_("%B: Unmatched OMIT_FP in %A."), abfd, sec);
+ _bfd_error_handler (_("%B: Unmatched OMIT_FP in %A."), abfd, sec);
continue;
}
@@ -14855,7 +14857,7 @@ nds32_elf_ex9_init (void)
sizeof (struct elf_nds32_code_hash_entry),
1023))
{
- (*_bfd_error_handler) (_("Linker: cannot init ex9 hash table error \n"));
+ _bfd_error_handler (_("Linker: cannot init ex9 hash table error \n"));
return FALSE;
}
return TRUE;
@@ -15263,7 +15265,7 @@ nds32_elf_ex9_reloc_jmp (struct bfd_link_info *link_info)
if (!nds32_get_section_contents
(fix_ptr->sec->owner, fix_ptr->sec,
&source_contents, TRUE))
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Linker: error cannot fixed ex9 relocation \n"));
if (temp_ptr->order < 32)
insn_ex9 = INSN_EX9_IT_2;
@@ -15277,7 +15279,7 @@ nds32_elf_ex9_reloc_jmp (struct bfd_link_info *link_info)
else
{
if (!temp_ptr->next || temp_ptr->m_list != temp_ptr->next->m_list)
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("Linker: error cannot fixed ex9 relocation \n"));
else
temp_ptr = temp_ptr->next;
@@ -15487,7 +15489,7 @@ nds32_elf_ex9_build_hash_table (bfd *abfd, asection *sec,
if (relocation & align)
{
/* Incorrect alignment. */
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: warning: unaligned small data access. "
"For entry: {%d, %d, %d}, addr = 0x%x, align = 0x%x."),
bfd_get_filename (abfd), irel->r_offset,
@@ -15520,7 +15522,7 @@ nds32_elf_ex9_build_hash_table (bfd *abfd, asection *sec,
bfd_hash_lookup (&ex9_code_table, code, TRUE, TRUE);
if (entry == NULL)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%P%F: failed creating ex9.it %s hash table: %E\n"), code);
return FALSE;
}
generated by cgit v1.1 at 2024-10-13 16:36:28 +0000