/* NDS32-specific support for 32-bit ELF.
- Copyright (C) 2012-2015 Free Software Foundation, Inc.
+ Copyright (C) 2012-2017 Free Software Foundation, Inc.
Contributed by Andes Technology Corporation.
This file is part of BFD, the Binary File Descriptor library.
static bfd_boolean nds32_elf_object_p (bfd *);
static void nds32_elf_final_write_processing (bfd *, bfd_boolean);
static bfd_boolean nds32_elf_set_private_flags (bfd *, flagword);
-static bfd_boolean nds32_elf_merge_private_bfd_data (bfd *, bfd *);
+static bfd_boolean nds32_elf_merge_private_bfd_data
+ (bfd *, struct bfd_link_info *);
static bfd_boolean nds32_elf_print_private_bfd_data (bfd *, void *);
static bfd_boolean nds32_elf_gc_sweep_hook
(bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
(Elf_Internal_Rela *, Elf_Internal_Rela *,
Elf_Internal_Rela *, enum elf_nds32_reloc_type);
static bfd_vma calculate_memory_address
- (bfd *, Elf_Internal_Rela *, Elf_Internal_Sym *, Elf_Internal_Shdr *);
-static int nds32_get_section_contents (bfd *, asection *, bfd_byte **);
+(bfd *, Elf_Internal_Rela *, Elf_Internal_Sym *, Elf_Internal_Shdr *);
+static int nds32_get_section_contents (bfd *, asection *,
+ bfd_byte **, bfd_boolean);
static bfd_boolean nds32_elf_ex9_build_hash_table
- (bfd *, asection *, struct bfd_link_info *);
+(bfd *, asection *, struct bfd_link_info *);
static bfd_boolean nds32_elf_ex9_itb_base (struct bfd_link_info *);
static void nds32_elf_ex9_import_table (struct bfd_link_info *);
static void nds32_elf_ex9_finish (struct bfd_link_info *);
/* This reloc does nothing. */
HOWTO (R_NDS32_NONE, /* type */
0, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
- 32, /* bitsize */
+ 3, /* size (0 = byte, 1 = short, 2 = long) */
+ 0, /* bitsize */
FALSE, /* pc_relative */
0, /* bitpos */
- complain_overflow_bitfield, /* complain_on_overflow */
+ complain_overflow_dont, /* complain_on_overflow */
bfd_elf_generic_reloc, /* special_function */
"R_NDS32_NONE", /* name */
FALSE, /* partial_inplace */
{
char *ptr = (char *) base;
int i, j;
- char *tmp = alloca (size);
+ char *tmp = xmalloc (size);
/* If i is less than j, i is inserted before j.
memmove (ptr + (j + 1) * size, ptr + j * size, (i - j) * size);
memcpy (ptr + j * size, tmp, size);
}
+ free (tmp);
}
/* Sort relocation by r_offset.
r_type = ELF32_R_TYPE (dst->r_info);
if (r_type > R_NDS32_GNU_VTENTRY)
{
- _bfd_error_handler (_("%A: invalid NDS32 reloc number: %d"), abfd, r_type);
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%B: invalid NDS32 reloc number: %d"), abfd, r_type);
r_type = 0;
}
cache_ptr->howto = bfd_elf32_bfd_reloc_type_table_lookup (r_type);
_bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
elf_tdata (abfd)->core->command =
_bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+ break;
default:
return FALSE;
}
}
- if (add_symbol == TRUE)
+ if (add_symbol)
{
if (h)
{
}
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;
}
}
return NULL;
}
- ret->sgot = NULL;
- ret->sgotplt = NULL;
- ret->srelgot = NULL;
- ret->splt = NULL;
- ret->srelplt = NULL;
- ret->sdynbss = NULL;
- ret->srelbss = NULL;
- ret->sym_ld_script = NULL;
- ret->ex9_export_file = NULL;
- ret->ex9_import_file = NULL;
-
return &ret->root.root;
}
-/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
- shortcuts to them in our hash table. */
-
-static bfd_boolean
-create_got_section (bfd *dynobj, struct bfd_link_info *info)
-{
- struct elf_nds32_link_hash_table *htab;
-
- if (!_bfd_elf_create_got_section (dynobj, info))
- return FALSE;
-
- htab = nds32_elf_hash_table (info);
- htab->sgot = bfd_get_section_by_name (dynobj, ".got");
- htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
- if (!htab->sgot || !htab->sgotplt)
- abort ();
-
- /* _bfd_elf_create_got_section will create it for us. */
- htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
- if (htab->srelgot == NULL
- || !bfd_set_section_flags (dynobj, htab->srelgot,
- (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
- | SEC_IN_MEMORY | SEC_LINKER_CREATED
- | SEC_READONLY))
- || !bfd_set_section_alignment (dynobj, htab->srelgot, 2))
- return FALSE;
-
- return TRUE;
-}
-
/* Create dynamic sections when linking against a dynamic object. */
static bfd_boolean
pltflags |= SEC_READONLY;
s = bfd_make_section (abfd, ".plt");
- htab->splt = s;
+ htab->root.splt = s;
if (s == NULL
|| !bfd_set_section_flags (abfd, s, pltflags)
|| !bfd_set_section_alignment (abfd, s, bed->plt_alignment))
h->def_regular = 1;
h->type = STT_OBJECT;
- if (info->shared && !bfd_elf_link_record_dynamic_symbol (info, h))
+ if (bfd_link_pic (info) && !bfd_elf_link_record_dynamic_symbol (info, h))
return FALSE;
}
s = bfd_make_section (abfd,
bed->default_use_rela_p ? ".rela.plt" : ".rel.plt");
- htab->srelplt = s;
+ htab->root.srelplt = s;
if (s == NULL
|| !bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|| !bfd_set_section_alignment (abfd, s, ptralign))
return FALSE;
- if (htab->sgot == NULL && !create_got_section (abfd, info))
+ if (htab->root.sgot == NULL && !_bfd_elf_create_got_section (abfd, info))
return FALSE;
{
be needed, we can discard it later. We will never need this
section when generating a shared object, since they do not use
copy relocs. */
- if (!info->shared)
+ if (!bfd_link_pic (info))
{
s = bfd_make_section (abfd, (bed->default_use_rela_p
? ".rela.bss" : ".rel.bss"));
when we know the address of the .got section. */
if (h->type == STT_FUNC || h->needs_plt)
{
- if (!info->shared
+ if (!bfd_link_pic (info)
&& !h->def_dynamic
&& !h->ref_dynamic
&& h->root.type != bfd_link_hash_undefweak
only references to the symbol are via the global offset table.
For such cases we need not do anything here; the relocations will
be handled correctly by relocate_section. */
- if (info->shared)
+ if (bfd_link_pic (info))
return TRUE;
/* If there are no references to this symbol that do not use the
return FALSE;
}
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
+ if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h))
{
- asection *s = htab->splt;
+ asection *s = htab->root.splt;
/* If this is the first .plt entry, make room for the special
first entry. */
location in the .plt. This is required to make function
pointers compare as equal between the normal executable and
the shared library. */
- if (!info->shared && !h->def_regular)
+ if (!bfd_link_pic (info) && !h->def_regular)
{
h->root.u.def.section = s;
h->root.u.def.value = h->plt.offset;
/* We also need to make an entry in the .got.plt section, which
will be placed in the .got section by the linker script. */
- htab->sgotplt->size += 4;
+ htab->root.sgotplt->size += 4;
/* We also need to make an entry in the .rel.plt section. */
- htab->srelplt->size += sizeof (Elf32_External_Rela);
+ htab->root.srelplt->size += sizeof (Elf32_External_Rela);
}
else
{
return FALSE;
}
- s = htab->sgot;
+ s = htab->root.sgot;
h->got.offset = s->size;
if (tls_type == GOT_UNKNOWN)
s->size += 4;
dyn = htab->root.dynamic_sections_created;
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
- htab->srelgot->size += sizeof (Elf32_External_Rela);
+ if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h))
+ htab->root.srelgot->size += sizeof (Elf32_External_Rela);
}
else
h->got.offset = (bfd_vma) - 1;
space for pc-relative relocs that have become local due to symbol
visibility changes. */
- if (info->shared)
+ if (bfd_link_pic (info))
{
if (h->def_regular && (h->forced_local || info->symbolic))
{
if (htab->root.dynamic_sections_created)
{
/* Set the contents of the .interp section to the interpreter. */
- if (!info->shared)
+ if (!bfd_link_pic (info) && !info->nointerp)
{
s = bfd_get_section_by_name (dynobj, ".interp");
BFD_ASSERT (s != NULL);
symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
locsymcount = symtab_hdr->sh_info;
end_local_got = local_got + locsymcount;
- s = htab->sgot;
- srel = htab->srelgot;
+ s = htab->root.sgot;
+ srel = htab->root.srelgot;
for (; local_got < end_local_got; ++local_got)
{
if (*local_got > 0)
{
*local_got = s->size;
s->size += 4;
- if (info->shared)
+ if (bfd_link_pic (info))
srel->size += sizeof (Elf32_External_Rela);
}
else
if ((s->flags & SEC_LINKER_CREATED) == 0)
continue;
- if (s == htab->splt)
+ if (s == htab->root.splt)
{
/* Strip this section if we don't need it; see the
comment below. */
}
- else if (s == htab->sgot)
+ else if (s == htab->root.sgot)
{
got_size += s->size;
}
- else if (s == htab->sgotplt)
+ else if (s == htab->root.sgotplt)
{
got_size += s->size;
}
else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
{
- if (s->size != 0 && s != htab->srelplt)
+ if (s->size != 0 && s != htab->root.srelplt)
relocs = TRUE;
/* We use the reloc_count field as a counter if we need
#define add_dynamic_entry(TAG, VAL) \
_bfd_elf_add_dynamic_entry (info, TAG, VAL)
- if (!info->shared)
+ if (!bfd_link_pic (info))
{
if (!add_dynamic_entry (DT_DEBUG, 0))
return FALSE;
}
- if (htab->splt->size != 0)
+ if (htab->root.splt->size != 0)
{
if (!add_dynamic_entry (DT_PLTGOT, 0)
|| !add_dynamic_entry (DT_PLTRELSZ, 0)
switch (size)
{
default:
- case 0:
- case 1:
- case 8:
abort ();
break;
+ case 0:
+ return bfd_reloc_ok;
case 2:
x = bfd_getb16 (location);
break;
dynobj = htab->root.dynobj;
local_got_offsets = elf_local_got_offsets (input_bfd);
- sgot = htab->sgot;
- splt = htab->splt;
+ sgot = htab->root.sgot;
+ splt = htab->root.splt;
sreloc = NULL;
rel = relocs;
table = nds32_elf_hash_table (info);
eliminate_gc_relocs = table->eliminate_gc_relocs;
/* By this time, we can adjust the value of _SDA_BASE_. */
- if ((!info->relocatable))
+ if ((!bfd_link_relocatable (info)))
{
is_SDA_BASE_set = 1;
r = nds32_elf_final_sda_base (output_bfd, info, &gp, TRUE);
return FALSE;
}
+ if (is_ITB_BASE_set == 0)
+ {
+ /* Set the _ITB_BASE_. */
+ if (!nds32_elf_ex9_itb_base (info))
+ {
+ _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
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);
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%B: error: unknown relocation type %d."),
+ input_bfd, r_type);
bfd_set_error (bfd_error_bad_value);
ret = FALSE;
continue;
|| (r_type >= R_NDS32_INSN16 && r_type <= R_NDS32_25_FIXED_RELA)
|| r_type == R_NDS32_DATA
|| r_type == R_NDS32_TRAN
- || (r_type >= R_NDS32_LONGCALL4 && r_type <= R_NDS32_LONGJUMP6))
+ || (r_type >= R_NDS32_LONGCALL4 && r_type <= R_NDS32_LONGJUMP7))
continue;
- /* If we enter the fp-as-gp region. Resolve the address of best fp-base. */
+ /* If we enter the fp-as-gp region. Resolve the address
+ of best fp-base. */
if (ELF32_R_TYPE (rel->r_info) == R_NDS32_RELAX_REGION_BEGIN
&& (rel->r_addend & R_NDS32_RELAX_REGION_OMIT_FP_FLAG))
{
if (((r_type >= R_NDS32_DWARF2_OP1_RELA
&& r_type <= R_NDS32_DWARF2_LEB_RELA)
- || r_type >= R_NDS32_RELAX_ENTRY) && !info->relocatable)
+ || r_type >= R_NDS32_RELAX_ENTRY) && !bfd_link_relocatable (info))
continue;
howto = bfd_elf32_bfd_reloc_type_table_lookup (r_type);
}
- if (info->relocatable)
+ if (bfd_link_relocatable (info))
{
/* This is a relocatable link. We don't have to change
anything, unless the reloc is against a section symbol,
off = h->got.offset;
BFD_ASSERT (off != (bfd_vma) - 1);
dyn = htab->root.dynamic_sections_created;
- if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
- || (info->shared
+ if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
+ bfd_link_pic (info),
+ h)
+ || (bfd_link_pic (info)
&& (info->symbolic
|| h->dynindx == -1
|| h->forced_local) && h->def_regular))
{
bfd_put_32 (output_bfd, relocation, sgot->contents + off);
- if (info->shared)
+ if (bfd_link_pic (info))
{
asection *srelgot;
Elf_Internal_Rela outrel;
/* We need to generate a R_NDS32_RELATIVE reloc
for the dynamic linker. */
- srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+ srelgot = htab->root.srelgot;
BFD_ASSERT (srelgot != NULL);
outrel.r_offset = (elf_gp (output_bfd)
case R_NDS32_LO12S1_RELA:
case R_NDS32_LO12S0_RELA:
case R_NDS32_LO12S0_ORI_RELA:
- if (info->shared && r_symndx != 0
+ if (bfd_link_pic (info) && r_symndx != 0
&& (input_section->flags & SEC_ALLOC) != 0
&& (eliminate_gc_relocs == 0
|| (sec && (sec->flags & SEC_EXCLUDE) == 0))
break;
case R_NDS32_25_ABS_RELA:
- if (info->shared)
+ if (bfd_link_pic (info))
{
- (*_bfd_error_handler)
- (_("%s: warning: cannot deal R_NDS32_25_ABS_RELA in shared "
- "mode."), bfd_get_filename (input_bfd));
+ _bfd_error_handler
+ (_("%B: warning: cannot deal R_NDS32_25_ABS_RELA in shared "
+ "mode."), input_bfd);
return FALSE;
}
break;
dyn = htab->root.dynamic_sections_created;
if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL
- (dyn, info->shared, h) || (info->shared
- && (info->symbolic
- || h->dynindx == -1
- || h->forced_local)
- && h->def_regular))
+ (dyn, bfd_link_pic (info), h)
+ || (bfd_link_pic (info)
+ && (info->symbolic
+ || h->dynindx == -1
+ || h->forced_local)
+ && h->def_regular))
{
/* This is actually a static link, or it is a
-Bsymbolic link and the symbol is defined
{
bfd_put_32 (output_bfd, relocation, sgot->contents + off);
- if (info->shared)
+ if (bfd_link_pic (info))
{
asection *srelgot;
Elf_Internal_Rela outrel;
/* We need to generate a R_NDS32_RELATIVE reloc
for the dynamic linker. */
- srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+ srelgot = htab->root.srelgot;
BFD_ASSERT (srelgot != NULL);
outrel.r_offset = (elf_gp (output_bfd)
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;
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;
if (relocation & align)
{
/* Incorrect alignment. */
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B(%A): warning: unaligned small data access of type %d."),
input_bfd, input_section, r_type);
ret = FALSE;
BFD_ASSERT (off != (bfd_vma) - 1);
dyn = htab->root.dynamic_sections_created;
tls_type = ((struct elf_nds32_link_hash_entry *) h)->tls_type;
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
- && (!info->shared
+ if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h)
+ && (!bfd_link_pic (info)
|| !SYMBOL_REFERENCES_LOCAL (info, h)))
indx = h->dynindx;
}
else
{
bfd_boolean need_relocs = FALSE;
- srelgot = htab->srelgot;
- if ((info->shared || indx != 0)
+ srelgot = htab->root.srelgot;
+ if ((bfd_link_pic (info) || indx != 0)
&& (h == NULL
|| ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|| h->root.type != bfd_link_hash_undefweak))
switch (r)
{
case bfd_reloc_overflow:
- if (!((*info->callbacks->reloc_overflow)
- (info, (h ? &h->root : NULL), name, howto->name,
- (bfd_vma) 0, input_bfd, input_section, offset)))
- return FALSE;
+ (*info->callbacks->reloc_overflow)
+ (info, (h ? &h->root : NULL), name, howto->name,
+ (bfd_vma) 0, input_bfd, input_section, offset);
break;
case bfd_reloc_undefined:
- if (!((*info->callbacks->undefined_symbol)
- (info, name, input_bfd, input_section, offset, TRUE)))
- return FALSE;
+ (*info->callbacks->undefined_symbol)
+ (info, name, input_bfd, input_section, offset, TRUE);
break;
case bfd_reloc_outofrange:
errmsg = _("internal error: unknown error");
/* Fall through. */
-common_error:
- if (!((*info->callbacks->warning)
- (info, errmsg, name, input_bfd, input_section, offset)))
- return FALSE;
+ common_error:
+ (*info->callbacks->warning) (info, errmsg, name, input_bfd,
+ input_section, offset);
break;
}
}
BFD_ASSERT (h->dynindx != -1);
- splt = htab->splt;
- sgot = htab->sgotplt;
- srela = htab->srelplt;
+ splt = htab->root.splt;
+ sgot = htab->root.sgotplt;
+ srela = htab->root.srelplt;
BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
/* Get the index in the procedure linkage table which
got_offset = (plt_index + 3) * 4;
/* Fill in the entry in the procedure linkage table. */
- if (!info->shared)
+ if (!bfd_link_pic (info))
{
unsigned long insn;
/* This symbol has an entry in the global offset table.
Set it up. */
- sgot = htab->sgot;
- srela = htab->srelgot;
+ sgot = htab->root.sgot;
+ srela = htab->root.srelgot;
BFD_ASSERT (sgot != NULL && srela != NULL);
rela.r_offset = (sgot->output_section->vma
the symbol was forced to be local because of a version file.
The entry in the global offset table will already have been
initialized in the relocate_section function. */
- if (info->shared
+ if (bfd_link_pic (info)
&& (info->symbolic
|| h->dynindx == -1 || h->forced_local) && h->def_regular)
{
htab = nds32_elf_hash_table (info);
dynobj = htab->root.dynobj;
- sgot = htab->sgotplt;
+ sgot = htab->root.sgotplt;
sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
if (htab->root.dynamic_sections_created)
break;
case DT_PLTGOT:
- /* name = ".got"; */
- s = htab->sgot->output_section;
+ s = htab->root.sgotplt;
goto get_vma;
case DT_JMPREL:
- s = htab->srelplt->output_section;
+ s = htab->root.srelplt;
get_vma:
- BFD_ASSERT (s != NULL);
- dyn.d_un.d_ptr = s->vma;
+ dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
break;
case DT_PLTRELSZ:
- s = htab->srelplt->output_section;
- BFD_ASSERT (s != NULL);
+ s = htab->root.srelplt;
dyn.d_un.d_val = s->size;
bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
break;
-
- case DT_RELASZ:
- /* My reading of the SVR4 ABI indicates that the
- procedure linkage table relocs (DT_JMPREL) should be
- included in the overall relocs (DT_RELA). This is
- what Solaris does. However, UnixWare can not handle
- that case. Therefore, we override the DT_RELASZ entry
- here to make it not include the JMPREL relocs. Since
- the linker script arranges for .rela.plt to follow all
- other relocation sections, we don't have to worry
- about changing the DT_RELA entry. */
- if (htab->srelplt != NULL)
- {
- s = htab->srelplt->output_section;
- dyn.d_un.d_val -= s->size;
- }
- bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
- break;
}
}
/* Fill in the first entry in the procedure linkage table. */
- splt = htab->splt;
+ splt = htab->root.splt;
if (splt && splt->size > 0)
{
- if (info->shared)
+ if (bfd_link_pic (info))
{
unsigned long insn;
long offset;
/* Get vec_size in file. */
unsigned int flag_t;
- nds32_get_section_contents (ibfd, sec_t, &contents);
+ nds32_get_section_contents (ibfd, sec_t, &contents, TRUE);
flag_t = bfd_get_32 (ibfd, contents);
/* The value could only be 4 or 16. */
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
+ /* xgettext:c-format */
+ (_("%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
object file when linking. */
static bfd_boolean
-nds32_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+nds32_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
{
+ bfd *obfd = info->output_bfd;
flagword out_flags;
flagword in_flags;
flagword out_16regs;
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);
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);
}
/* 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);
{
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);
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
+ /* xgettext:c-format */
+ (_("%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)
struct elf_nds32_dyn_relocs **pp;
struct elf_nds32_dyn_relocs *p;
- if (!info->shared && h->plt.refcount > 0)
+ if (!bfd_link_pic (info) && h->plt.refcount > 0)
h->plt.refcount -= 1;
eh = (struct elf_nds32_link_hash_entry *) h;
bfd *dynobj;
asection *sreloc = NULL;
- if (info->relocatable)
+ if (bfd_link_relocatable (info))
return TRUE;
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
/* Some relocs require a global offset table. We create
got section here, since these relocation need got section
and it is not created yet. */
- if (htab->sgot == NULL)
+ if (htab->root.sgot == NULL)
{
switch (r_type)
{
case R_NDS32_TLS_IE_LO12S2:
if (dynobj == NULL)
htab->root.dynobj = dynobj = abfd;
- if (!create_got_section (dynobj, info))
+ if (!_bfd_elf_create_got_section (dynobj, info))
return FALSE;
break;
case R_NDS32_17_PCREL_RELA:
case R_NDS32_25_PCREL_RELA:
- if (h != NULL && !info->shared)
+ if (h != NULL && !bfd_link_pic (info))
{
h->non_got_ref = 1;
h->plt.refcount += 1;
If on the other hand, we are creating an executable, we may need
to keep relocations for symbols satisfied by a dynamic library
if we manage to avoid copy relocs for the symbol. */
- if ((info->shared
+ if ((bfd_link_pic (info)
&& (sec->flags & SEC_ALLOC) != 0
&& ((r_type != R_NDS32_25_PCREL_RELA
&& r_type != R_NDS32_15_PCREL_RELA
&& (!info->symbolic
|| h->root.type == bfd_link_hash_defweak
|| !h->def_regular))))
- || (!info->shared
+ || (!bfd_link_pic (info)
&& (sec->flags & SEC_ALLOC) != 0
&& h != NULL
&& (h->root.type == bfd_link_hash_defweak
else
{
asection *s;
+ void *vpp;
Elf_Internal_Sym *isym;
isym = bfd_sym_from_r_symndx (&htab->sym_cache, abfd, r_symndx);
if (s == NULL)
return FALSE;
- head = ((struct elf_nds32_dyn_relocs **)
- &elf_section_data (s)->local_dynrel);
+ vpp = &elf_section_data (s)->local_dynrel;
+ head = (struct elf_nds32_dyn_relocs **) vpp;
}
p = *head;
h = elf_sym_hashes (abfd)[indx];
BFD_ASSERT (h != NULL);
htab = nds32_elf_hash_table (link_info);
- splt = htab->splt;
+ splt = htab->root.splt;
while (h->root.type == bfd_link_hash_indirect
|| h->root.type == bfd_link_hash_warning)
int *pinsn_type)
{
uint16_t insn16 = 0;
- int insn_type;
+ int insn_type = 0;
unsigned long mach = bfd_get_mach (abfd);
if (N32_SH5 (insn) != 0)
if (symndx >= 0)
{
BFD_ASSERT (h != NULL);
- return htab->sgot->output_section->vma + htab->sgot->output_offset
- + h->got.offset;
+ return (htab->root.sgot->output_section->vma
+ + htab->root.sgot->output_offset
+ + h->got.offset);
}
else
{
local_got_offsets = elf_local_got_offsets (abfd);
BFD_ASSERT (local_got_offsets != NULL);
- return htab->sgot->output_section->vma + htab->sgot->output_offset
- + local_got_offsets[ELF32_R_SYM (irel->r_info)];
+ return (htab->root.sgot->output_section->vma
+ + htab->root.sgot->output_offset
+ + local_got_offsets[ELF32_R_SYM (irel->r_info)]);
}
/* The _GLOBAL_OFFSET_TABLE_ may be undefweak(or should be?). */
offset = reloc->r_offset;
- if (!nds32_get_section_contents (abfd, sec, &contents))
+ if (!nds32_get_section_contents (abfd, sec, &contents, TRUE))
return FALSE;
insn = bfd_getb32 (contents + offset);
find_relocs_at_address_addr (Elf_Internal_Rela *reloc,
Elf_Internal_Rela *relocs,
Elf_Internal_Rela *irelend,
- unsigned char reloc_type,
+ enum elf_nds32_reloc_type reloc_type,
bfd_vma offset_p)
{
Elf_Internal_Rela *rel_t = NULL;
if (!(sect->flags & SEC_RELOC))
continue;
- nds32_get_section_contents (abfd, sect, &contents);
+ nds32_get_section_contents (abfd, sect, &contents, TRUE);
for (irel = internal_relocs; irel < irelend; irel++)
{
unsigned long val = 0;
unsigned long mask;
long before, between;
- long offset;
+ long offset = 0;
switch (ELF32_R_TYPE (irel->r_info))
{
unsigned long before, between;
bfd_byte *endp, *p;
- val = read_unsigned_leb128 (abfd, contents + irel->r_offset,
- &len);
+ val = _bfd_read_unsigned_leb128 (abfd, contents + irel->r_offset,
+ &len);
before = get_nds32_elf_blank_total (&blank_t, irel->r_addend, 0);
between = get_nds32_elf_blank_total (&blank_t,
if (blank_t2 && blank_t2->next
&& (blank_t2->offset > raddr
|| blank_t2->next->offset <= raddr))
- (*_bfd_error_handler)
- (_("%B: %s\n"), abfd,
- "Error: search_nds32_elf_blank reports wrong node");
+ _bfd_error_handler
+ (_("%B: Error: search_nds32_elf_blank reports wrong node\n"), abfd);
/* Mark reloc in deleted portion as NONE.
For some relocs like R_NDS32_LABEL that doesn't modify the
/* Get the contents of a section. */
static int
-nds32_get_section_contents (bfd *abfd, asection *sec, bfd_byte **contents_p)
+nds32_get_section_contents (bfd *abfd, asection *sec,
+ bfd_byte **contents_p, bfd_boolean cache)
{
/* Get the section contents. */
if (elf_section_data (sec)->this_hdr.contents != NULL)
{
if (!bfd_malloc_and_get_section (abfd, sec, contents_p))
return FALSE;
- elf_section_data (sec)->this_hdr.contents = *contents_p;
+ if (cache)
+ elf_section_data (sec)->this_hdr.contents = *contents_p;
}
return TRUE;
#define IS_OPTIMIZE(addend) ((addend) & 0x40000000)
#define IS_16BIT_ON(addend) ((addend) & 0x20000000)
+static const char * unrecognized_reloc_msg =
+ /* xgettext:c-format */
+ N_("%B: warning: %s points to unrecognized reloc at 0x%lx.");
+
/* Relax LONGCALL1 relocation for nds32_elf_relax_section. */
static bfd_boolean
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL1 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL1",
+ (long) irel->r_offset);
return FALSE;
}
if (i1_irelfn == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL2 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL2",
+ (long) irel->r_offset);
return FALSE;
}
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL3 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL3",
+ (long) irel->r_offset);
return FALSE;
}
R_NDS32_LO12S0_ORI_RELA, laddr + 4);
if (hi_irelfn == irelend || lo_irelfn == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGJUMP1 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP1",
+ (long) irel->r_offset);
return FALSE;
}
if (i2_irelfn == irelend || cond_irelfn == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGJUMP2 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP2",
+ (long) irel->r_offset);
return FALSE;
}
if (hi_irelfn == irelend || lo_irelfn == irelend || cond_irelfn == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGJUMP3 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP3",
+ (long) irel->r_offset);
return FALSE;
}
if (hi_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL4 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL4",
+ (long) irel->r_offset);
return FALSE;
}
if (ptr_irel == irelend || em_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL4 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL4",
+ (long) irel->r_offset);
return FALSE;
}
/* Check these is enough space to insert jal in R_NDS32_EMPTY. */
R_NDS32_25_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL5 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL5",
+ (long) irel->r_offset);
return FALSE;
}
if (em_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL6",
+ (long) irel->r_offset);
return FALSE;
}
R_NDS32_PTR_RESOLVED, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd,
+ "R_NDS32_LONGCALL6", (long) irel->r_offset);
return FALSE;
}
cond_irel->r_addend = 1;
R_NDS32_PTR_RESOLVED, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGCALL6 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd,
+ "R_NDS32_LONGCALL6", (long) irel->r_offset);
return FALSE;
}
cond_irel->r_addend = 1;
if (hi_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGJUMP4 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP4",
+ (long) irel->r_offset);
return FALSE;
}
if (ptr_irel == irelend || em_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGJUMP4 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP4",
+ (long) irel->r_offset);
return FALSE;
}
R_NDS32_25_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGJUMP5 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP5",
+ (long) irel->r_offset);
return FALSE;
}
if (em_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGJUMP6 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP6",
+ (long) irel->r_offset);
return FALSE;
}
R_NDS32_15_PCREL_RELA, irel->r_addend);
if (cond_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LONGJUMP7 points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP7",
+ (long) irel->r_offset);
return FALSE;
}
bfd_byte *contents, Elf_Internal_Sym *isymbuf,
Elf_Internal_Shdr *symtab_hdr, int load_store_relax)
{
- int eliminate_sethi = 0, range_type, i;
+ int eliminate_sethi = 0, range_type;
+ unsigned int i;
bfd_vma local_sda, laddr;
int seq_len; /* Original length of instruction sequence. */
uint32_t insn;
*insn_len = seq_len;
/* Get the high part relocation. */
- for (i = 0; (unsigned) i < sizeof (checked_types); i++)
+ for (i = 0; i < ARRAY_SIZE (checked_types); i++)
{
hi_irelfn = find_relocs_at_address_addr (irel, internal_relocs, irelend,
checked_types[i], laddr);
if (hi_irelfn == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_LOADSTORE points to unrecognized"
- "reloc at 0x%lx.", abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LOADSTORE",
+ (long) irel->r_offset);
return FALSE;
}
success = 1;
break;
}
+ /* Fall through. */
case (N32_OP6_MEM << 8) | N32_MEM_LH:
case (N32_OP6_MEM << 8) | N32_MEM_SH:
case (N32_OP6_MEM << 8) | N32_MEM_LHS:
success = 1;
break;
}
+ /* Fall through. */
case (N32_OP6_MEM << 8) | N32_MEM_LW:
case (N32_OP6_MEM << 8) | N32_MEM_SW:
/* The range is +/-64k. */
success = 1;
break;
}
+ /* Fall through. */
default:
break;
}
if (re_irel == irelend)
{
- (*_bfd_error_handler)
- ("%B: warning: R_NDS32_PTR points to unrecognized reloc at 0x%lx.",
- abfd, (long) irel->r_offset);
+ _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_PTR",
+ (long) irel->r_offset);
return FALSE;
}
struct elf_nds32_link_hash_table *table,
struct bfd_link_info *link_info)
{
- static asection *final_sec;
+ static asection *final_sec, *first_sec = NULL;
+ static bfd_boolean normal_again = FALSE;
static bfd_boolean set = FALSE;
static bfd_boolean first = TRUE;
int round_table[] = {
static int pass = 0;
static int relax_round;
+ /* The new round. */
+ if (init && first_sec == sec)
+ {
+ set = TRUE;
+ normal_again = FALSE;
+ }
+
if (first)
{
/* Run an empty run to get the final section. */
/* It has to enter relax again because we can
not make sure what the final turn is. */
*again = TRUE;
+
first = FALSE;
+ first_sec = sec;
}
- if (!set && *again)
+ if (!set)
{
- /* It is reentered when again is FALSE. */
+ /* Not reenter yet. */
final_sec = sec;
return relax_round;
}
- /* The second round begins. */
- set = TRUE;
-
relax_round = round_table[pass];
+ if (!init && relax_round == NDS32_RELAX_NORMAL_ROUND && *again)
+ normal_again = TRUE;
+
if (!init && final_sec == sec)
{
switch (relax_round)
{
case NDS32_RELAX_NORMAL_ROUND:
- if (!*again)
+ if (!normal_again)
{
/* Normal relaxation done. */
if (table->target_optimize & NDS32_RELAX_JUMP_IFC_ON)
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++;
{
/* 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:
* non-code section or
* empty content or
* no reloc entry. */
- if (link_info->relocatable
+ if (bfd_link_relocatable (link_info)
|| (sec->flags & SEC_RELOC) == 0
|| (sec->flags & SEC_EXCLUDE) == 1
|| (sec->flags & SEC_CODE) == 0
/* 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);
}
}
if (ELF32_R_TYPE (irel->r_info) == R_NDS32_RELAX_ENTRY)
{
if (irel->r_addend & R_NDS32_RELAX_ENTRY_DISABLE_RELAX_FLAG)
- return TRUE;
+ {
+ nds32_elf_pick_relax (FALSE, sec, again, table, link_info);
+ return TRUE;
+ }
if (irel->r_addend & R_NDS32_RELAX_ENTRY_OPTIMIZE_FLAG)
optimize = 1;
load_store_relax = table->load_store_relax;
/* Get symbol table and section content. */
- if (!nds32_get_section_contents (abfd, sec, &contents)
+ if (!nds32_get_section_contents (abfd, sec, &contents, TRUE)
|| !nds32_get_local_syms (abfd, sec, &isymbuf))
goto error_return;
irelend, isymbuf))
goto error_return;
- if (*again == FALSE)
+ if (!*again)
{
if (!nds32_fag_remove_unused_fpbase (abfd, sec, internal_relocs,
irelend))
nds32_elf_pick_relax (FALSE, sec, again, table, link_info);
- if (*again == FALSE)
+ if (!*again)
{
if (!nds32_relax_adjust_label (abfd, sec, internal_relocs, contents,
&relax_blank_list, optimize, opt_size))
relax_blank_list = NULL;
}
- if (*again == FALSE)
+ if (!*again)
{
/* Closing the section, so we don't relax it anymore. */
bfd_vma sec_size_align;
Elf_Internal_Rela *tmp_rel;
/* Pad to alignment boundary. Only handle current section alignment. */
- sec_size_align = (sec->size + (~((-1) << sec->alignment_power)))
- & ((-1) << sec->alignment_power);
+ sec_size_align = (sec->size + (~((-1U) << sec->alignment_power)))
+ & ((-1U) << sec->alignment_power);
if ((sec_size_align - sec->size) & 0x2)
{
insn16 = NDS32_NOP16;
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
- if (!nds32_get_section_contents (abfd, sec, &contents)
+ if (!nds32_get_section_contents (abfd, sec, &contents, TRUE)
|| !nds32_get_local_syms (abfd, sec, &isymbuf))
return FALSE;
{
/* Begin of the region. */
if (begin_rel)
- (*_bfd_error_handler) (_("%B: Nested OMIT_FP in %A."), abfd, sec);
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%B: Nested OMIT_FP in %A."), abfd, sec);
begin_rel = irel;
nds32_fag_init (&fag_head);
if (begin_rel == NULL)
{
- (*_bfd_error_handler) (_("%B: Unmatched OMIT_FP in %A."), abfd, sec);
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%B: Unmatched OMIT_FP in %A."), abfd, sec);
continue;
}
*/
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
- nds32_get_section_contents (abfd, sec, &contents);
+ nds32_get_section_contents (abfd, sec, &contents, TRUE);
for (irel = internal_relocs; irel < irelend; irel++)
{
return NULL;
/* Read in the section. */
- if (!nds32_get_section_contents (input_bfd, input_section, &data))
+ if (!nds32_get_section_contents (input_bfd, input_section, &data, FALSE))
return NULL;
if (reloc_size == 0)
switch (r)
{
case bfd_reloc_undefined:
- if (!((*link_info->callbacks->undefined_symbol)
- (link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
- input_bfd, input_section, (*parent)->address, TRUE)))
- goto error_return;
+ (*link_info->callbacks->undefined_symbol)
+ (link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
+ input_bfd, input_section, (*parent)->address, TRUE);
break;
case bfd_reloc_dangerous:
BFD_ASSERT (error_message != NULL);
- if (!((*link_info->callbacks->reloc_dangerous)
- (link_info, error_message, input_bfd, input_section,
- (*parent)->address)))
- goto error_return;
+ (*link_info->callbacks->reloc_dangerous)
+ (link_info, error_message,
+ input_bfd, input_section, (*parent)->address);
break;
case bfd_reloc_overflow:
- if (!((*link_info->callbacks->reloc_overflow)
- (link_info, NULL,
- bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
- (*parent)->howto->name, (*parent)->addend,
- input_bfd, input_section, (*parent)->address)))
- goto error_return;
+ (*link_info->callbacks->reloc_overflow)
+ (link_info, NULL,
+ bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
+ (*parent)->howto->name, (*parent)->addend,
+ input_bfd, input_section, (*parent)->address);
break;
case bfd_reloc_outofrange:
/* PR ld/13730:
complete binaries. Do not abort, but issue an error
message instead. */
link_info->callbacks->einfo
+ /* xgettext:c-format */
(_("%X%P: %B(%A): relocation \"%R\" goes out of range\n"),
abfd, input_section, * parent);
goto error_return;
&& !(irel->r_addend & R_NDS32_RELAX_ENTRY_IFC_FLAG)))
return TRUE;
- if (!nds32_get_section_contents (abfd, sec, &contents))
+ if (!nds32_get_section_contents (abfd, sec, &contents, TRUE))
return FALSE;
table = nds32_elf_hash_table (info);
irelend = internal_relocs + ptr->sec->reloc_count;
if (!nds32_get_section_contents (ptr->sec->owner, ptr->sec,
- &contents))
+ &contents, TRUE))
return FALSE;
while (irel_ptr)
(irel_ptr->sec->owner, irel_ptr->sec, NULL, NULL,
TRUE /* keep_memory */);
irelend = internal_relocs + irel_ptr->sec->reloc_count;
- if (!nds32_get_section_contents
- (irel_ptr->sec->owner, irel_ptr->sec, &contents))
+ if (!nds32_get_section_contents (irel_ptr->sec->owner,
+ irel_ptr->sec, &contents,
+ TRUE))
return FALSE;
irel = irel_ptr->irel;
if (ptr->h == NULL)
{
/* Local symbol. */
- if (!nds32_get_section_contents (ptr->sec->owner, ptr->sec, &contents))
+ if (!nds32_get_section_contents (ptr->sec->owner, ptr->sec,
+ &contents, TRUE))
return FALSE;
while (irel_ptr)
return FALSE;
}
if (!nds32_get_section_contents
- (irel_ptr->sec->owner, irel_ptr->sec, &contents))
+ (irel_ptr->sec->owner, irel_ptr->sec, &contents, TRUE))
return FALSE;
insn16 = INSN_IFCALL9 | (relocation >> 1);
bfd_putb16 (insn16, contents + irel_ptr->irel->r_offset);
table_sec = bfd_get_section_by_name (it_abfd, ".ex9.itable");
if (table_sec != NULL)
{
- if (!nds32_get_section_contents (it_abfd, table_sec, &contents))
+ if (!nds32_get_section_contents (it_abfd, table_sec, &contents, TRUE))
return;
for (ptr = ex9_insn_head; ptr !=NULL ; ptr = ptr->next)
/* Load section instructions, relocations, and symbol table. */
- if (!nds32_get_section_contents (abfd, sec, &contents)
+ if (!nds32_get_section_contents (abfd, sec, &contents, TRUE)
|| !nds32_get_local_syms (abfd, sec, &isym))
return FALSE;
internal_relocs =
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;
{
int num = 0;
bfd_byte *contents;
- unsigned long insn;
FILE *ex9_import_file;
int update_ex9_table;
struct elf_nds32_link_hash_table *table;
/* Read instructions from the input file and build the list. */
while (!feof (ex9_import_file))
{
+ unsigned long insn;
char *code;
struct elf_nds32_insn_times_entry *ptr;
size_t nread;
break;
insn = bfd_getb32 (contents);
code = bfd_malloc (sizeof (char) * 9);
- snprintf (code, 9, "%08lx", insn);
+ snprintf (code, 9, "%08lx", (insn & 0xffffffff));
ptr = bfd_malloc (sizeof (struct elf_nds32_insn_times_entry));
ptr->string = code;
ptr->order = num;
if (table_sec->size == 0)
return;
- if (!nds32_get_section_contents (it_abfd, table_sec, &contents))
+ if (!nds32_get_section_contents (it_abfd, table_sec, &contents, TRUE))
return;
}
}
{
if (!nds32_get_section_contents
(fix_ptr->sec->owner, fix_ptr->sec,
- &source_contents))
- (*_bfd_error_handler)
+ &source_contents, TRUE))
+ _bfd_error_handler
(_("Linker: error cannot fixed ex9 relocation \n"));
if (temp_ptr->order < 32)
insn_ex9 = INSN_EX9_IT_2;
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;
sym_hashes = elf_sym_hashes (abfd);
/* Load section instructions, relocations, and symbol table. */
- if (!nds32_get_section_contents (abfd, sec, &contents))
+ if (!nds32_get_section_contents (abfd, sec, &contents, TRUE))
return FALSE;
internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL,
if (relocation & align)
{
/* Incorrect alignment. */
- (*_bfd_error_handler)
- (_("%s: warning: unaligned small data access. "
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%B: warning: unaligned small data access. "
"For entry: {%d, %d, %d}, addr = 0x%x, align = 0x%x."),
- bfd_get_filename (abfd), irel->r_offset,
+ abfd, irel->r_offset,
irel->r_info, irel->r_addend, relocation, align);
off += 4;
continue;
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;
}
#define elf_backend_may_use_rel_p 1
#define elf_backend_default_use_rela_p 1
#define elf_backend_may_use_rela_p 1
+#define elf_backend_dtrel_excludes_plt 1
#include "elf32-target.h"
projects / deliverable / binutils-gdb.git / blobdiff