aboutsummaryrefslogtreecommitdiff
path: root/bfd/elf32-xtensa.c
diff options
context:
space:
mode:
Diffstat (limited to 'bfd/elf32-xtensa.c')
-rw-r--r--bfd/elf32-xtensa.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 64e40d3..b3ddbf1 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -1001,7 +1001,7 @@ elf_xtensa_check_relocs (bfd *abfd,
for (rel = relocs; rel < rel_end; rel++)
{
unsigned int r_type;
- unsigned long r_symndx;
+ unsigned r_symndx;
struct elf_link_hash_entry *h = NULL;
struct elf_xtensa_link_hash_entry *eh;
int tls_type, old_tls_type;
@@ -2787,7 +2787,7 @@ elf_xtensa_relocate_section (bfd *output_bfd,
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B(%A+0x%lx): relocation offset out of range (size=0x%x)"),
+ (_("%B(%A+%#Lx): relocation offset out of range (size=%#Lx)"),
input_bfd, input_section, rel->r_offset, input_size);
bfd_set_error (bfd_error_bad_value);
return FALSE;
@@ -2813,12 +2813,12 @@ elf_xtensa_relocate_section (bfd *output_bfd,
_bfd_error_handler
((sym_type == STT_TLS
/* xgettext:c-format */
- ? _("%B(%A+0x%lx): %s used with TLS symbol %s")
+ ? _("%B(%A+%#Lx): %s used with TLS symbol %s")
/* xgettext:c-format */
- : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
+ : _("%B(%A+%#Lx): %s used with non-TLS symbol %s")),
input_bfd,
input_section,
- (long) rel->r_offset,
+ rel->r_offset,
howto->name,
name);
}
@@ -3071,10 +3071,10 @@ elf_xtensa_relocate_section (bfd *output_bfd,
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+ (_("%B(%A+%#Lx): unresolvable %s relocation against symbol `%s'"),
input_bfd,
input_section,
- (long) rel->r_offset,
+ rel->r_offset,
howto->name,
name);
return FALSE;
@@ -6549,7 +6549,8 @@ extend_ebb_bounds_forward (ebb_t *ebb)
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
+ (_("%B(%A+%#Lx): could not decode instruction; "
+ "possible configuration mismatch"),
ebb->sec->owner, ebb->sec, ebb->end_offset + insn_block_len);
return FALSE;
}
@@ -6626,7 +6627,8 @@ extend_ebb_bounds_backward (ebb_t *ebb)
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
+ (_("%B(%A+%#Lx): could not decode instruction; "
+ "possible configuration mismatch"),
ebb->sec->owner, ebb->sec, ebb->end_offset + insn_block_len);
return FALSE;
}
@@ -7740,7 +7742,9 @@ compute_text_actions (bfd *abfd,
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B(%A+0x%lx): could not decode instruction for XTENSA_ASM_SIMPLIFY relocation; possible configuration mismatch"),
+ (_("%B(%A+%#Lx): could not decode instruction for "
+ "XTENSA_ASM_SIMPLIFY relocation; "
+ "possible configuration mismatch"),
sec->owner, sec, r_offset);
continue;
}
@@ -7999,7 +8003,8 @@ compute_ebb_proposed_actions (ebb_constraint *ebb_table)
decode_error:
_bfd_error_handler
/* xgettext:c-format */
- (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
+ (_("%B(%A+%#Lx): could not decode instruction; "
+ "possible configuration mismatch"),
ebb->sec->owner, ebb->sec, offset);
return FALSE;
}
@@ -10776,7 +10781,7 @@ do_fix_for_relocatable_link (Elf_Internal_Rela *rel,
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B(%A+0x%lx): unexpected fix for %s relocation"),
+ (_("%B(%A+%#Lx): unexpected fix for %s relocation"),
input_bfd, input_section, rel->r_offset,
elf_howto_table[r_type].name);
return FALSE;