/* NDS32-specific support for 32-bit ELF.
- Copyright (C) 2012-2015 Free Software Foundation, Inc.
+ Copyright (C) 2012-2016 Free Software Foundation, Inc.
Contributed by Andes Technology Corporation.
This file is part of BFD, the Binary File Descriptor library.
{
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.
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;
}
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;
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;
s->size += 4;
dyn = htab->root.dynamic_sections_created;
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
+ if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h))
htab->srelgot->size += sizeof (Elf32_External_Rela);
}
else
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);
{
*local_got = s->size;
s->size += 4;
- if (info->shared)
+ if (bfd_link_pic (info))
srel->size += sizeof (Elf32_External_Rela);
}
else
#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;
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);
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;
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 "
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;
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;
}
{
bfd_boolean need_relocs = FALSE;
srelgot = htab->srelgot;
- if ((info->shared || indx != 0)
+ 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;
}
}
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;
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)
{
break;
case DT_PLTGOT:
- /* name = ".got"; */
- s = htab->sgot->output_section;
+ s = htab->sgotplt;
goto get_vma;
case DT_JMPREL:
- s = htab->srelplt->output_section;
+ s = htab->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->srelplt;
dyn.d_un.d_val = s->size;
bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
break;
about changing the DT_RELA entry. */
if (htab->srelplt != NULL)
{
- s = htab->srelplt->output_section;
+ s = htab->srelplt;
dyn.d_un.d_val -= s->size;
}
bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
splt = htab->splt;
if (splt && splt->size > 0)
{
- if (info->shared)
+ if (bfd_link_pic (info))
{
unsigned long insn;
long offset;
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;
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
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)
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;
unsigned long val = 0;
unsigned long mask;
long before, between;
- long offset;
+ long offset = 0;
switch (ELF32_R_TYPE (irel->r_info))
{
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);
* 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
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;
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:
projects / deliverable / binutils-gdb.git / blobdiff