/* BFD back-end for HP PA-RISC ELF files.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001
- Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001,
+ 2002 Free Software Foundation, Inc.
Original code by
Center for Software Science
: be,n 0(%sr0,%rp) ; inter-space return */
#define PLT_ENTRY_SIZE 8
-#define PLABEL_PLT_ENTRY_SIZE PLT_ENTRY_SIZE
#define GOT_ENTRY_SIZE 4
#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so.1"
/* Set if this symbol is used by a plabel reloc. */
unsigned int plabel:1;
-
- /* Set if this symbol is an init or fini function and thus should
- use an absolute reloc. */
- unsigned int plt_abs:1;
};
struct elf32_hppa_link_hash_table {
/* The main hash table. */
- struct elf_link_hash_table root;
+ struct elf_link_hash_table elf;
/* The stub hash table. */
struct bfd_hash_table stub_hash_table;
/* Set if we need a .plt stub to support lazy dynamic linking. */
unsigned int need_plt_stub:1;
+
+ /* Small local sym to section mapping cache. */
+ struct sym_sec_cache sym_sec;
};
/* Various hash macros and functions. */
static boolean elf32_hppa_create_dynamic_sections
PARAMS ((bfd *, struct bfd_link_info *));
+static void elf32_hppa_copy_indirect_symbol
+ PARAMS ((struct elf_link_hash_entry *, struct elf_link_hash_entry *));
+
static boolean elf32_hppa_check_relocs
PARAMS ((bfd *, struct bfd_link_info *,
asection *, const Elf_Internal_Rela *));
asection *, const Elf_Internal_Rela *));
static void elf32_hppa_hide_symbol
- PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+ PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
static boolean elf32_hppa_adjust_dynamic_symbol
PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean hppa_handle_PIC_calls
+static boolean mark_PIC_calls
+ PARAMS ((struct elf_link_hash_entry *, PTR));
+
+static boolean allocate_plt_static
PARAMS ((struct elf_link_hash_entry *, PTR));
static boolean allocate_dynrelocs
struct bfd_hash_table *table;
const char *string;
{
- struct elf32_hppa_stub_hash_entry *ret;
-
- ret = (struct elf32_hppa_stub_hash_entry *) entry;
-
/* Allocate the structure if it has not already been allocated by a
subclass. */
- if (ret == NULL)
+ if (entry == NULL)
{
- ret = ((struct elf32_hppa_stub_hash_entry *)
- bfd_hash_allocate (table,
- sizeof (struct elf32_hppa_stub_hash_entry)));
- if (ret == NULL)
- return NULL;
+ entry = bfd_hash_allocate (table,
+ sizeof (struct elf32_hppa_stub_hash_entry));
+ if (entry == NULL)
+ return entry;
}
/* Call the allocation method of the superclass. */
- ret = ((struct elf32_hppa_stub_hash_entry *)
- bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-
- if (ret)
+ entry = bfd_hash_newfunc (entry, table, string);
+ if (entry != NULL)
{
+ struct elf32_hppa_stub_hash_entry *eh;
+
/* Initialize the local fields. */
- ret->stub_sec = NULL;
- ret->stub_offset = 0;
- ret->target_value = 0;
- ret->target_section = NULL;
- ret->stub_type = hppa_stub_long_branch;
- ret->h = NULL;
- ret->id_sec = NULL;
+ eh = (struct elf32_hppa_stub_hash_entry *) entry;
+ eh->stub_sec = NULL;
+ eh->stub_offset = 0;
+ eh->target_value = 0;
+ eh->target_section = NULL;
+ eh->stub_type = hppa_stub_long_branch;
+ eh->h = NULL;
+ eh->id_sec = NULL;
}
- return (struct bfd_hash_entry *) ret;
+ return entry;
}
/* Initialize an entry in the link hash table. */
struct bfd_hash_table *table;
const char *string;
{
- struct elf32_hppa_link_hash_entry *ret;
-
- ret = (struct elf32_hppa_link_hash_entry *) entry;
-
/* Allocate the structure if it has not already been allocated by a
subclass. */
- if (ret == NULL)
+ if (entry == NULL)
{
- ret = ((struct elf32_hppa_link_hash_entry *)
- bfd_hash_allocate (table,
- sizeof (struct elf32_hppa_link_hash_entry)));
- if (ret == NULL)
- return NULL;
+ entry = bfd_hash_allocate (table,
+ sizeof (struct elf32_hppa_link_hash_entry));
+ if (entry == NULL)
+ return entry;
}
/* Call the allocation method of the superclass. */
- ret = ((struct elf32_hppa_link_hash_entry *)
- _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
- table, string));
-
- if (ret)
+ entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+ if (entry != NULL)
{
+ struct elf32_hppa_link_hash_entry *eh;
+
/* Initialize the local fields. */
- ret->stub_cache = NULL;
- ret->dyn_relocs = NULL;
- ret->maybe_pic_call = 0;
- ret->pic_call = 0;
- ret->plabel = 0;
- ret->plt_abs = 0;
+ eh = (struct elf32_hppa_link_hash_entry *) entry;
+ eh->stub_cache = NULL;
+ eh->dyn_relocs = NULL;
+ eh->maybe_pic_call = 0;
+ eh->pic_call = 0;
+ eh->plabel = 0;
}
- return (struct bfd_hash_entry *) ret;
+ return entry;
}
/* Create the derived linker hash table. The PA ELF port uses the derived
if (ret == NULL)
return NULL;
- if (!_bfd_elf_link_hash_table_init (&ret->root, abfd, hppa_link_hash_newfunc))
+ if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, hppa_link_hash_newfunc))
{
bfd_release (abfd, ret);
return NULL;
ret->has_12bit_branch = 0;
ret->has_17bit_branch = 0;
ret->need_plt_stub = 0;
+ ret->sym_sec.abfd = NULL;
- return &ret->root.root;
+ return &ret->elf.root;
}
/* Build a name for an entry in the stub hash table. */
creating the stub name takes a bit of time. */
static struct elf32_hppa_stub_hash_entry *
-hppa_get_stub_entry (input_section, sym_sec, hash, rel, hplink)
+hppa_get_stub_entry (input_section, sym_sec, hash, rel, htab)
const asection *input_section;
const asection *sym_sec;
struct elf32_hppa_link_hash_entry *hash;
const Elf_Internal_Rela *rel;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
{
struct elf32_hppa_stub_hash_entry *stub_entry;
const asection *id_sec;
Stub names need to include a section id, as there may well be
more than one stub used to reach say, printf, and we need to
distinguish between them. */
- id_sec = hplink->stub_group[input_section->id].link_sec;
+ id_sec = htab->stub_group[input_section->id].link_sec;
if (hash != NULL && hash->stub_cache != NULL
&& hash->stub_cache->h == hash
if (stub_name == NULL)
return NULL;
- stub_entry = hppa_stub_hash_lookup (&hplink->stub_hash_table,
+ stub_entry = hppa_stub_hash_lookup (&htab->stub_hash_table,
stub_name, false, false);
- if (stub_entry == NULL)
- {
- if (hash == NULL || hash->elf.root.type != bfd_link_hash_undefweak)
- (*_bfd_error_handler) (_("%s(%s+0x%lx): cannot find stub entry %s"),
- bfd_archive_filename (input_section->owner),
- input_section->name,
- (long) rel->r_offset,
- stub_name);
- }
- else
- {
- if (hash != NULL)
- hash->stub_cache = stub_entry;
- }
+ if (hash != NULL)
+ hash->stub_cache = stub_entry;
free (stub_name);
}
stub entry are initialised. */
static struct elf32_hppa_stub_hash_entry *
-hppa_add_stub (stub_name, section, hplink)
+hppa_add_stub (stub_name, section, htab)
const char *stub_name;
asection *section;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
{
asection *link_sec;
asection *stub_sec;
struct elf32_hppa_stub_hash_entry *stub_entry;
- link_sec = hplink->stub_group[section->id].link_sec;
- stub_sec = hplink->stub_group[section->id].stub_sec;
+ link_sec = htab->stub_group[section->id].link_sec;
+ stub_sec = htab->stub_group[section->id].stub_sec;
if (stub_sec == NULL)
{
- stub_sec = hplink->stub_group[link_sec->id].stub_sec;
+ stub_sec = htab->stub_group[link_sec->id].stub_sec;
if (stub_sec == NULL)
{
bfd_size_type len;
char *s_name;
len = strlen (link_sec->name) + sizeof (STUB_SUFFIX);
- s_name = bfd_alloc (hplink->stub_bfd, len);
+ s_name = bfd_alloc (htab->stub_bfd, len);
if (s_name == NULL)
return NULL;
strcpy (s_name, link_sec->name);
strcpy (s_name + len - sizeof (STUB_SUFFIX), STUB_SUFFIX);
- stub_sec = (*hplink->add_stub_section) (s_name, link_sec);
+ stub_sec = (*htab->add_stub_section) (s_name, link_sec);
if (stub_sec == NULL)
return NULL;
- hplink->stub_group[link_sec->id].stub_sec = stub_sec;
+ htab->stub_group[link_sec->id].stub_sec = stub_sec;
}
- hplink->stub_group[section->id].stub_sec = stub_sec;
+ htab->stub_group[section->id].stub_sec = stub_sec;
}
/* Enter this entry into the linker stub hash table. */
- stub_entry = hppa_stub_hash_lookup (&hplink->stub_hash_table, stub_name,
+ stub_entry = hppa_stub_hash_lookup (&htab->stub_hash_table, stub_name,
true, false);
if (stub_entry == NULL)
{
{
struct elf32_hppa_stub_hash_entry *stub_entry;
struct bfd_link_info *info;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
asection *stub_sec;
bfd *stub_bfd;
bfd_byte *loc;
stub_entry = (struct elf32_hppa_stub_hash_entry *) gen_entry;
info = (struct bfd_link_info *) in_arg;
- hplink = hppa_link_hash_table (info);
+ htab = hppa_link_hash_table (info);
stub_sec = stub_entry->stub_sec;
/* Make a note of the offset within the stubs for this entry. */
off &= ~ (bfd_vma) 1;
sym_value = (off
- + hplink->splt->output_offset
- + hplink->splt->output_section->vma
- - elf_gp (hplink->splt->output_section->owner));
+ + htab->splt->output_offset
+ + htab->splt->output_section->vma
+ - elf_gp (htab->splt->output_section->owner));
insn = ADDIL_DP;
#if R19_STUBS
insn = hppa_rebuild_insn ((int) LDW_R1_R21, val, 14);
bfd_put_32 (stub_bfd, insn, loc + 4);
- if (hplink->multi_subspace)
+ if (htab->multi_subspace)
{
val = hppa_field_adjust (sym_value, (bfd_signed_vma) 4, e_rrsel);
insn = hppa_rebuild_insn ((int) LDW_R1_DLT, val, 14);
struct elf32_hppa_link_hash_entry *eh;
bfd_vma value;
- dynobj = hplink->root.dynobj;
+ dynobj = htab->elf.dynobj;
eh = (struct elf32_hppa_link_hash_entry *) stub_entry->h;
if (eh->elf.root.type != bfd_link_hash_defined
<funcaddr>
<__gp>. */
- bfd_put_32 (hplink->splt->owner, value,
- hplink->splt->contents + off);
- value = elf_gp (hplink->splt->output_section->owner);
- bfd_put_32 (hplink->splt->owner, value,
- hplink->splt->contents + off + 4);
+ bfd_put_32 (htab->splt->owner, value,
+ htab->splt->contents + off);
+ value = elf_gp (htab->splt->output_section->owner);
+ bfd_put_32 (htab->splt->owner, value,
+ htab->splt->contents + off + 4);
}
break;
PTR in_arg;
{
struct elf32_hppa_stub_hash_entry *stub_entry;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
int size;
/* Massage our args to the form they really have. */
stub_entry = (struct elf32_hppa_stub_hash_entry *) gen_entry;
- hplink = (struct elf32_hppa_link_hash_table *) in_arg;
+ htab = (struct elf32_hppa_link_hash_table *) in_arg;
if (stub_entry->stub_type == hppa_stub_long_branch)
size = 8;
size = 24;
else /* hppa_stub_import or hppa_stub_import_shared. */
{
- if (hplink->multi_subspace)
+ if (htab->multi_subspace)
size = 28;
else
size = 16;
bfd *abfd;
struct bfd_link_info *info;
{
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
/* Don't try to create the .plt and .got twice. */
- hplink = hppa_link_hash_table (info);
- if (hplink->splt != NULL)
+ htab = hppa_link_hash_table (info);
+ if (htab->splt != NULL)
return true;
/* Call the generic code to do most of the work. */
if (! _bfd_elf_create_dynamic_sections (abfd, info))
return false;
- hplink->splt = bfd_get_section_by_name (abfd, ".plt");
- hplink->srelplt = bfd_get_section_by_name (abfd, ".rela.plt");
+ htab->splt = bfd_get_section_by_name (abfd, ".plt");
+ htab->srelplt = bfd_get_section_by_name (abfd, ".rela.plt");
- hplink->sgot = bfd_get_section_by_name (abfd, ".got");
- hplink->srelgot = bfd_make_section (abfd, ".rela.got");
- if (hplink->srelgot == NULL
- || ! bfd_set_section_flags (abfd, hplink->srelgot,
+ htab->sgot = bfd_get_section_by_name (abfd, ".got");
+ htab->srelgot = bfd_make_section (abfd, ".rela.got");
+ if (htab->srelgot == NULL
+ || ! bfd_set_section_flags (abfd, htab->srelgot,
(SEC_ALLOC
| SEC_LOAD
| SEC_HAS_CONTENTS
| SEC_IN_MEMORY
| SEC_LINKER_CREATED
| SEC_READONLY))
- || ! bfd_set_section_alignment (abfd, hplink->srelgot, 2))
+ || ! bfd_set_section_alignment (abfd, htab->srelgot, 2))
return false;
- hplink->sdynbss = bfd_get_section_by_name (abfd, ".dynbss");
- hplink->srelbss = bfd_get_section_by_name (abfd, ".rela.bss");
+ htab->sdynbss = bfd_get_section_by_name (abfd, ".dynbss");
+ htab->srelbss = bfd_get_section_by_name (abfd, ".rela.bss");
return true;
}
+/* Copy the extra info we tack onto an elf_link_hash_entry. */
+
+static void
+elf32_hppa_copy_indirect_symbol (dir, ind)
+ struct elf_link_hash_entry *dir, *ind;
+{
+ struct elf32_hppa_link_hash_entry *edir, *eind;
+
+ edir = (struct elf32_hppa_link_hash_entry *) dir;
+ eind = (struct elf32_hppa_link_hash_entry *) ind;
+
+ if (eind->dyn_relocs != NULL)
+ {
+ if (edir->dyn_relocs != NULL)
+ {
+ struct elf32_hppa_dyn_reloc_entry **pp;
+ struct elf32_hppa_dyn_reloc_entry *p;
+
+ if (ind->root.type == bfd_link_hash_indirect)
+ abort ();
+
+ /* Add reloc counts against the weak sym to the strong sym
+ list. Merge any entries against the same section. */
+ for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+ {
+ struct elf32_hppa_dyn_reloc_entry *q;
+
+ for (q = edir->dyn_relocs; q != NULL; q = q->next)
+ if (q->sec == p->sec)
+ {
+#if RELATIVE_DYNRELOCS
+ q->relative_count += p->relative_count;
+#endif
+ q->count += p->count;
+ *pp = p->next;
+ break;
+ }
+ if (q == NULL)
+ pp = &p->next;
+ }
+ *pp = edir->dyn_relocs;
+ }
+
+ edir->dyn_relocs = eind->dyn_relocs;
+ eind->dyn_relocs = NULL;
+ }
+
+ _bfd_elf_link_hash_copy_indirect (dir, ind);
+}
+
/* Look through the relocs for a section during the first phase, and
- allocate space in the global offset table or procedure linkage
- table. At this point we haven't necessarily read all the input
- files. */
+ calculate needed space in the global offset table, procedure linkage
+ table, and dynamic reloc sections. At this point we haven't
+ necessarily read all the input files. */
static boolean
elf32_hppa_check_relocs (abfd, info, sec, relocs)
asection *sec;
const Elf_Internal_Rela *relocs;
{
- bfd *dynobj;
Elf_Internal_Shdr *symtab_hdr;
struct elf_link_hash_entry **sym_hashes;
- bfd_signed_vma *local_got_refcounts;
const Elf_Internal_Rela *rel;
const Elf_Internal_Rela *rel_end;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
asection *sreloc;
asection *stubreloc;
if (info->relocateable)
return true;
- hplink = hppa_link_hash_table (info);
- dynobj = hplink->root.dynobj;
+ htab = hppa_link_hash_table (info);
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
sym_hashes = elf_sym_hashes (abfd);
- local_got_refcounts = elf_local_got_refcounts (abfd);
sreloc = NULL;
stubreloc = NULL;
break;
case R_PARISC_PCREL12F:
- hplink->has_12bit_branch = 1;
+ htab->has_12bit_branch = 1;
/* Fall thru. */
case R_PARISC_PCREL17C:
case R_PARISC_PCREL17F:
- hplink->has_17bit_branch = 1;
+ htab->has_17bit_branch = 1;
/* Fall thru. */
case R_PARISC_PCREL22F:
/* Function calls might need to go through the .plt, and
{
/* Allocate space for a GOT entry, as well as a dynamic
relocation for this entry. */
- if (dynobj == NULL)
- hplink->root.dynobj = dynobj = abfd;
-
- if (hplink->sgot == NULL)
+ if (htab->sgot == NULL)
{
- if (! elf32_hppa_create_dynamic_sections (dynobj, info))
+ if (htab->elf.dynobj == NULL)
+ htab->elf.dynobj = abfd;
+ if (!elf32_hppa_create_dynamic_sections (htab->elf.dynobj, info))
return false;
}
if (h != NULL)
{
- if (h->elf.got.refcount == -1)
- h->elf.got.refcount = 1;
- else
- h->elf.got.refcount += 1;
+ h->elf.got.refcount += 1;
}
else
{
+ bfd_signed_vma *local_got_refcounts;
+
/* This is a global offset table entry for a local symbol. */
+ local_got_refcounts = elf_local_got_refcounts (abfd);
if (local_got_refcounts == NULL)
{
bfd_size_type size;
size = symtab_hdr->sh_info;
size *= 2 * sizeof (bfd_signed_vma);
local_got_refcounts = ((bfd_signed_vma *)
- bfd_alloc (abfd, size));
+ bfd_zalloc (abfd, size));
if (local_got_refcounts == NULL)
return false;
elf_local_got_refcounts (abfd) = local_got_refcounts;
- memset (local_got_refcounts, -1, (size_t) size);
}
- if (local_got_refcounts[r_symndx] == -1)
- local_got_refcounts[r_symndx] = 1;
- else
- local_got_refcounts[r_symndx] += 1;
+ local_got_refcounts[r_symndx] += 1;
}
}
{
if (h != NULL)
{
- if (h->elf.plt.refcount == -1)
- {
- h->elf.plt.refcount = 1;
- h->elf.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
- }
- else
- h->elf.plt.refcount += 1;
+ h->elf.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+ h->elf.plt.refcount += 1;
/* If this .plt entry is for a plabel, mark it so
that adjust_dynamic_symbol will keep the entry
}
else if (need_entry & PLT_PLABEL)
{
+ bfd_signed_vma *local_got_refcounts;
bfd_signed_vma *local_plt_refcounts;
+ local_got_refcounts = elf_local_got_refcounts (abfd);
if (local_got_refcounts == NULL)
{
bfd_size_type size;
size = symtab_hdr->sh_info;
size *= 2 * sizeof (bfd_signed_vma);
local_got_refcounts = ((bfd_signed_vma *)
- bfd_alloc (abfd, size));
+ bfd_zalloc (abfd, size));
if (local_got_refcounts == NULL)
return false;
elf_local_got_refcounts (abfd) = local_got_refcounts;
- memset (local_got_refcounts, -1, (size_t) size);
}
local_plt_refcounts = (local_got_refcounts
+ symtab_hdr->sh_info);
- if (local_plt_refcounts[r_symndx] == -1)
- local_plt_refcounts[r_symndx] = 1;
- else
- local_plt_refcounts[r_symndx] += 1;
+ local_plt_refcounts[r_symndx] += 1;
}
}
}
/* Flag this symbol as having a non-got, non-plt reference
so that we generate copy relocs if it turns out to be
dynamic. */
- if (need_entry == NEED_DYNREL
- && h != NULL
- && !info->shared
- && (sec->flags & SEC_READONLY) != 0)
+ if (h != NULL && !info->shared)
h->elf.elf_link_hash_flags |= ELF_LINK_NON_GOT_REF;
/* If we are creating a shared library then we need to copy
|| (!info->shared
&& (sec->flags & SEC_ALLOC) != 0
&& h != NULL
- && (h->elf.elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
&& (h->elf.root.type == bfd_link_hash_defweak
|| (h->elf.elf_link_hash_flags
& ELF_LINK_HASH_DEF_REGULAR) == 0)))
{
+ struct elf32_hppa_dyn_reloc_entry *p;
+ struct elf32_hppa_dyn_reloc_entry **head;
+
/* Create a reloc section in dynobj and make room for
this reloc. */
if (sreloc == NULL)
{
char *name;
-
- if (dynobj == NULL)
- hplink->root.dynobj = dynobj = abfd;
+ bfd *dynobj;
name = (bfd_elf_string_from_elf_section
(abfd,
return false;
}
+ if (htab->elf.dynobj == NULL)
+ htab->elf.dynobj = abfd;
+
+ dynobj = htab->elf.dynobj;
sreloc = bfd_get_section_by_name (dynobj, name);
if (sreloc == NULL)
{
relocations we need for this symbol. */
if (h != NULL)
{
- struct elf32_hppa_dyn_reloc_entry *p;
+ head = &h->dyn_relocs;
+ }
+ else
+ {
+ /* Track dynamic relocs needed for local syms too.
+ We really need local syms available to do this
+ easily. Oh well. */
+
+ asection *s;
+ s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
+ sec, r_symndx);
+ if (s == NULL)
+ return false;
- p = h->dyn_relocs;
- if (p == NULL || p->sec != sec)
- {
- p = ((struct elf32_hppa_dyn_reloc_entry *)
- bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
- if (p == NULL)
- return false;
- p->next = h->dyn_relocs;
- h->dyn_relocs = p;
- p->sec = sec;
- p->count = 0;
+ head = ((struct elf32_hppa_dyn_reloc_entry **)
+ &elf_section_data (s)->local_dynrel);
+ }
+
+ p = *head;
+ if (p == NULL || p->sec != sec)
+ {
+ p = ((struct elf32_hppa_dyn_reloc_entry *)
+ bfd_alloc (htab->elf.dynobj,
+ (bfd_size_type) sizeof *p));
+ if (p == NULL)
+ return false;
+ p->next = *head;
+ *head = p;
+ p->sec = sec;
+ p->count = 0;
#if RELATIVE_DYNRELOCS
- p->relative_count = 0;
+ p->relative_count = 0;
#endif
- }
+ }
- p->count += 1;
+ p->count += 1;
#if RELATIVE_DYNRELOCS
- if (!IS_ABSOLUTE_RELOC (rtype))
- p->relative_count += 1;
+ if (!IS_ABSOLUTE_RELOC (rtype))
+ p->relative_count += 1;
#endif
- }
- else
- {
- /* Track dynamic relocs needed for local syms too. */
- elf_section_data (sec)->local_dynrel += 1;
- }
}
}
}
}
else
{
- if (!(elf_bad_symtab (abfd)
- && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
- && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
- && sym->st_shndx != SHN_COMMON))
- {
- return bfd_section_from_elf_index (abfd, sym->st_shndx);
- }
+ return bfd_section_from_elf_index (abfd, sym->st_shndx);
}
return NULL;
const Elf_Internal_Rela *rel, *relend;
unsigned long r_symndx;
struct elf_link_hash_entry *h;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
bfd *dynobj;
- elf_section_data (sec)->local_dynrel = 0;
+ elf_section_data (sec)->local_dynrel = NULL;
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
sym_hashes = elf_sym_hashes (abfd);
local_plt_refcounts = local_got_refcounts;
if (local_plt_refcounts != NULL)
local_plt_refcounts += symtab_hdr->sh_info;
- hplink = hppa_link_hash_table (info);
- dynobj = hplink->root.dynobj;
+ htab = hppa_link_hash_table (info);
+ dynobj = htab->elf.dynobj;
if (dynobj == NULL)
return true;
plabels. */
static void
-elf32_hppa_hide_symbol (info, h)
- struct bfd_link_info *info ATTRIBUTE_UNUSED;
+elf32_hppa_hide_symbol (info, h, force_local)
+ struct bfd_link_info *info;
struct elf_link_hash_entry *h;
+ boolean force_local;
{
- if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
- h->dynindx = -1;
+ if (force_local)
+ {
+ h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
+ if (h->dynindx != -1)
+ {
+ h->dynindx = -1;
+ _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+ h->dynstr_index);
+ }
+ }
+
if (! ((struct elf32_hppa_link_hash_entry *) h)->plabel)
{
h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
struct bfd_link_info *info;
struct elf_link_hash_entry *h;
{
- bfd *dynobj;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
+ struct elf32_hppa_link_hash_entry *eh;
+ struct elf32_hppa_dyn_reloc_entry *p;
asection *s;
-
- hplink = hppa_link_hash_table (info);
- dynobj = hplink->root.dynobj;
+ unsigned int power_of_two;
/* If this is a function, put it in the procedure linkage table. We
will fill in the contents of the procedure linkage table later,
return true;
}
+ else
+ h->plt.offset = (bfd_vma) -1;
/* If this is a weak symbol, and there is a real definition, the
processor independent code will have arranged for us to see the
if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
return true;
+ eh = (struct elf32_hppa_link_hash_entry *) h;
+ for (p = eh->dyn_relocs; p != NULL; p = p->next)
+ {
+ s = p->sec->output_section;
+ if (s != NULL && (s->flags & SEC_READONLY) != 0)
+ break;
+ }
+
+ /* If we didn't find any dynamic relocs in read-only sections, then
+ we'll be keeping the dynamic relocs and avoiding the copy reloc. */
+ if (p == NULL)
+ {
+ h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
+ return true;
+ }
+
/* We must allocate the symbol in our .dynbss section, which will
become part of the .bss section of the executable. There will be
an entry for this symbol in the .dynsym section. The dynamic
both the dynamic object and the regular object will refer to the
same memory location for the variable. */
- s = hplink->sdynbss;
+ htab = hppa_link_hash_table (info);
/* We must generate a COPY reloc to tell the dynamic linker to
copy the initial value out of the dynamic object and into the
- runtime process image. We need to remember the offset into the
- .rela.bss section we are going to use. */
+ runtime process image. */
if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
{
- asection *srel;
-
- srel = hplink->srelbss;
- srel->_raw_size += sizeof (Elf32_External_Rela);
+ htab->srelbss->_raw_size += sizeof (Elf32_External_Rela);
h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
}
- {
- /* We need to figure out the alignment required for this symbol. I
- have no idea how other ELF linkers handle this. */
- unsigned int power_of_two;
+ /* We need to figure out the alignment required for this symbol. I
+ have no idea how other ELF linkers handle this. */
- power_of_two = bfd_log2 (h->size);
- if (power_of_two > 3)
- power_of_two = 3;
+ power_of_two = bfd_log2 (h->size);
+ if (power_of_two > 3)
+ power_of_two = 3;
+
+ /* Apply the required alignment. */
+ s = htab->sdynbss;
+ s->_raw_size = BFD_ALIGN (s->_raw_size,
+ (bfd_size_type) (1 << power_of_two));
+ if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
+ {
+ if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
+ return false;
+ }
- /* Apply the required alignment. */
- s->_raw_size = BFD_ALIGN (s->_raw_size,
- (bfd_size_type) (1 << power_of_two));
- if (power_of_two > bfd_get_section_alignment (dynobj, s))
- {
- if (! bfd_set_section_alignment (dynobj, s, power_of_two))
- return false;
- }
- }
/* Define the symbol as being at this point in the section. */
h->root.u.def.section = s;
h->root.u.def.value = s->_raw_size;
the first part of elf32_hppa_adjust_dynamic_symbol. */
static boolean
-hppa_handle_PIC_calls (h, inf)
+mark_PIC_calls (h, inf)
struct elf_link_hash_entry *h;
PTR inf ATTRIBUTE_UNUSED;
{
return true;
}
-/* Allocate space in .plt, .got and associated reloc sections for
- global syms. */
+/* Allocate space in the .plt for entries that won't have relocations.
+ ie. pic_call and plabel entries. */
static boolean
-allocate_dynrelocs (h, inf)
+allocate_plt_static (h, inf)
struct elf_link_hash_entry *h;
PTR inf;
{
struct bfd_link_info *info;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
asection *s;
- struct elf32_hppa_link_hash_entry *eh;
- struct elf32_hppa_dyn_reloc_entry *p;
if (h->root.type == bfd_link_hash_indirect
|| h->root.type == bfd_link_hash_warning)
return true;
info = (struct bfd_link_info *) inf;
- hplink = hppa_link_hash_table (info);
- if ((hplink->root.dynamic_sections_created
- && h->plt.refcount > 0)
- || ((struct elf32_hppa_link_hash_entry *) h)->pic_call)
+ htab = hppa_link_hash_table (info);
+ if (((struct elf32_hppa_link_hash_entry *) h)->pic_call)
+ {
+ /* Make an entry in the .plt section for non-pic code that is
+ calling pic code. */
+ s = htab->splt;
+ h->plt.offset = s->_raw_size;
+ s->_raw_size += PLT_ENTRY_SIZE;
+ }
+ else if (htab->elf.dynamic_sections_created
+ && h->plt.refcount > 0)
{
/* Make sure this symbol is output as a dynamic symbol.
Undefined weak syms won't yet be marked as dynamic. */
if (h->dynindx == -1
&& (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0
- && h->type != STT_PARISC_MILLI
- && !((struct elf32_hppa_link_hash_entry *) h)->pic_call)
+ && h->type != STT_PARISC_MILLI)
{
if (! bfd_elf32_link_record_dynamic_symbol (info, h))
return false;
}
- /* Make an entry in the .plt section. */
- s = hplink->splt;
- h->plt.offset = s->_raw_size;
- if (PLABEL_PLT_ENTRY_SIZE != PLT_ENTRY_SIZE
- && ((struct elf32_hppa_link_hash_entry *) h)->plabel
- && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+ if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
+ {
+ /* Allocate these later. */
+ }
+ else if (((struct elf32_hppa_link_hash_entry *) h)->plabel)
{
- /* Add some extra space for the dynamic linker to use. */
- s->_raw_size += PLABEL_PLT_ENTRY_SIZE;
+ /* Make an entry in the .plt section for plabel references
+ that won't have a .plt entry for other reasons. */
+ s = htab->splt;
+ h->plt.offset = s->_raw_size;
+ s->_raw_size += PLT_ENTRY_SIZE;
}
else
- s->_raw_size += PLT_ENTRY_SIZE;
-
- if (! ((struct elf32_hppa_link_hash_entry *) h)->pic_call
- && WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
{
- /* We also need to make an entry in the .rela.plt section. */
- hplink->srelplt->_raw_size += sizeof (Elf32_External_Rela);
- hplink->need_plt_stub = 1;
+ /* No .plt entry needed. */
+ h->plt.offset = (bfd_vma) -1;
+ h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
}
}
else
h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
}
- if (h->got.refcount > 0)
+ return true;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+ global syms. */
+
+static boolean
+allocate_dynrelocs (h, inf)
+ struct elf_link_hash_entry *h;
+ PTR inf;
+{
+ struct bfd_link_info *info;
+ struct elf32_hppa_link_hash_table *htab;
+ asection *s;
+ struct elf32_hppa_link_hash_entry *eh;
+ struct elf32_hppa_dyn_reloc_entry *p;
+
+ if (h->root.type == bfd_link_hash_indirect
+ || h->root.type == bfd_link_hash_warning)
+ return true;
+
+ info = (struct bfd_link_info *) inf;
+ htab = hppa_link_hash_table (info);
+ if (htab->elf.dynamic_sections_created
+ && h->plt.offset != (bfd_vma) -1
+ && !((struct elf32_hppa_link_hash_entry *) h)->pic_call
+ && WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
{
- boolean dyn;
+ /* Make an entry in the .plt section. */
+ s = htab->splt;
+ h->plt.offset = s->_raw_size;
+ s->_raw_size += PLT_ENTRY_SIZE;
+
+ /* We also need to make an entry in the .rela.plt section. */
+ htab->srelplt->_raw_size += sizeof (Elf32_External_Rela);
+ htab->need_plt_stub = 1;
+ }
+ if (h->got.refcount > 0)
+ {
/* Make sure this symbol is output as a dynamic symbol.
Undefined weak syms won't yet be marked as dynamic. */
if (h->dynindx == -1
return false;
}
- s = hplink->sgot;
+ s = htab->sgot;
h->got.offset = s->_raw_size;
s->_raw_size += GOT_ENTRY_SIZE;
- dyn = hplink->root.dynamic_sections_created;
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, h))
- hplink->srelgot->_raw_size += sizeof (Elf32_External_Rela);
+ if (htab->elf.dynamic_sections_created
+ && (info->shared
+ || (h->dynindx != -1
+ && h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0))
+ {
+ htab->srelgot->_raw_size += sizeof (Elf32_External_Rela);
+ }
}
else
h->got.offset = (bfd_vma) -1;
if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
&& (((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
- || (hplink->root.dynamic_sections_created
+ || (htab->elf.dynamic_sections_created
&& (h->root.type == bfd_link_hash_undefweak
|| h->root.type == bfd_link_hash_undefined))))
{
eh->dyn_relocs = NULL;
return true;
- keep:
+ keep: ;
}
/* Finally, allocate space. */
struct elf_link_hash_entry *h;
struct bfd_link_info *info;
{
- /* We only want to remove these from the dynamic symbol table.
- Therefore we do not leave ELF_LINK_FORCED_LOCAL set. */
- if (h->type == STT_PARISC_MILLI)
+ if (h->type == STT_PARISC_MILLI
+ && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
{
- unsigned short oldflags = h->elf_link_hash_flags;
- h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
- elf32_hppa_hide_symbol (info, h);
+ elf32_hppa_hide_symbol (info, h, true);
+
+ /* ?!? We only want to remove these from the dynamic symbol table.
+ Therefore we do not leave ELF_LINK_FORCED_LOCAL set. */
h->elf_link_hash_flags &= ~ELF_LINK_FORCED_LOCAL;
- h->elf_link_hash_flags |= oldflags & ELF_LINK_FORCED_LOCAL;
}
return true;
}
bfd *output_bfd ATTRIBUTE_UNUSED;
struct bfd_link_info *info;
{
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
bfd *dynobj;
bfd *ibfd;
asection *s;
boolean relocs;
- hplink = hppa_link_hash_table (info);
- dynobj = hplink->root.dynobj;
+ htab = hppa_link_hash_table (info);
+ dynobj = htab->elf.dynobj;
if (dynobj == NULL)
abort ();
- if (hplink->root.dynamic_sections_created)
+ if (htab->elf.dynamic_sections_created)
{
/* Set the contents of the .interp section to the interpreter. */
if (! info->shared)
}
/* Force millicode symbols local. */
- elf_link_hash_traverse (&hplink->root,
+ elf_link_hash_traverse (&htab->elf,
clobber_millicode_symbols,
info);
}
else
{
/* Run through the function symbols, looking for any that are
- PIC, and allocate space for the necessary .plt entries so
- that %r19 will be set up. */
+ PIC, and mark them as needing .plt entries so that %r19 will
+ be set up. */
if (! info->shared)
- elf_link_hash_traverse (&hplink->root,
- hppa_handle_PIC_calls,
- info);
+ elf_link_hash_traverse (&htab->elf, mark_PIC_calls, (PTR) info);
}
/* Set up .got and .plt offsets for local syms, and space for local
for (s = ibfd->sections; s != NULL; s = s->next)
{
- bfd_size_type count = elf_section_data (s)->local_dynrel;
+ struct elf32_hppa_dyn_reloc_entry *p;
- if (count != 0)
+ for (p = ((struct elf32_hppa_dyn_reloc_entry *)
+ elf_section_data (s)->local_dynrel);
+ p != NULL;
+ p = p->next)
{
- srel = elf_section_data (s)->sreloc;
- srel->_raw_size += count * sizeof (Elf32_External_Rela);
+ if (!bfd_is_abs_section (p->sec)
+ && bfd_is_abs_section (p->sec->output_section))
+ {
+ /* Input section has been discarded, either because
+ it is a copy of a linkonce section or due to
+ linker script /DISCARD/, so we'll be discarding
+ the relocs too. */
+ }
+ else
+ {
+ srel = elf_section_data (p->sec)->sreloc;
+ srel->_raw_size += p->count * sizeof (Elf32_External_Rela);
+ }
}
}
symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
locsymcount = symtab_hdr->sh_info;
end_local_got = local_got + locsymcount;
- s = hplink->sgot;
- srel = hplink->srelgot;
+ s = htab->sgot;
+ srel = htab->srelgot;
for (; local_got < end_local_got; ++local_got)
{
if (*local_got > 0)
local_plt = end_local_got;
end_local_plt = local_plt + locsymcount;
- if (! hplink->root.dynamic_sections_created)
+ if (! htab->elf.dynamic_sections_created)
{
/* Won't be used, but be safe. */
for (; local_plt < end_local_plt; ++local_plt)
}
else
{
- s = hplink->splt;
- srel = hplink->srelplt;
+ s = htab->splt;
+ srel = htab->srelplt;
for (; local_plt < end_local_plt; ++local_plt)
{
if (*local_plt > 0)
}
}
+ /* Do all the .plt entries without relocs first. The dynamic linker
+ uses the last .plt reloc to find the end of the .plt (and hence
+ the start of the .got) for lazy linking. */
+ elf_link_hash_traverse (&htab->elf, allocate_plt_static, (PTR) info);
+
/* Allocate global sym .plt and .got entries, and space for global
sym dynamic relocs. */
- elf_link_hash_traverse (&hplink->root, allocate_dynrelocs, (PTR) info);
+ elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
/* The check_relocs and adjust_dynamic_symbol entry points have
determined the sizes of the various dynamic sections. Allocate
if ((s->flags & SEC_LINKER_CREATED) == 0)
continue;
- if (s == hplink->splt)
+ if (s == htab->splt)
{
- if (hplink->need_plt_stub)
+ if (htab->need_plt_stub)
{
/* Make space for the plt stub at the end of the .plt
section. We want this stub right at the end, up
against the .got section. */
- int gotalign = bfd_section_alignment (dynobj, hplink->sgot);
+ int gotalign = bfd_section_alignment (dynobj, htab->sgot);
int pltalign = bfd_section_alignment (dynobj, s);
bfd_size_type mask;
s->_raw_size = (s->_raw_size + sizeof (plt_stub) + mask) & ~mask;
}
}
- else if (s == hplink->sgot)
+ else if (s == htab->sgot)
;
else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
{
{
/* Remember whether there are any reloc sections other
than .rela.plt. */
- if (s != hplink->srelplt)
+ if (s != htab->srelplt)
relocs = true;
/* We use the reloc_count field as a counter if we need
return false;
}
- if (hplink->root.dynamic_sections_created)
+ if (htab->elf.dynamic_sections_created)
{
/* Like IA-64 and HPPA64, always create a DT_PLTGOT. It
actually has nothing to do with the PLT, it is how we
return false;
}
- if (hplink->srelplt->_raw_size != 0)
+ if (htab->srelplt->_raw_size != 0)
{
if (!add_dynamic_entry (DT_PLTRELSZ, 0)
|| !add_dynamic_entry (DT_PLTREL, DT_RELA)
/* If any dynamic relocs apply to a read-only section,
then we need a DT_TEXTREL entry. */
- elf_link_hash_traverse (&hplink->root, readonly_dynrelocs, (PTR) info);
+ elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, (PTR) info);
if ((info->flags & DF_TEXTREL) != 0)
{
Elf_Internal_Sym *local_syms, **all_local_syms;
unsigned int bfd_indx, bfd_count;
int top_id, top_index;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
bfd_size_type stub_group_size;
boolean stubs_always_before_branch;
boolean stub_changed = 0;
boolean ret = 0;
bfd_size_type amt;
- hplink = hppa_link_hash_table (info);
+ htab = hppa_link_hash_table (info);
/* Stash our params away. */
- hplink->stub_bfd = stub_bfd;
- hplink->multi_subspace = multi_subspace;
- hplink->add_stub_section = add_stub_section;
- hplink->layout_sections_again = layout_sections_again;
+ htab->stub_bfd = stub_bfd;
+ htab->multi_subspace = multi_subspace;
+ htab->add_stub_section = add_stub_section;
+ htab->layout_sections_again = layout_sections_again;
stubs_always_before_branch = group_size < 0;
if (group_size < 0)
stub_group_size = -group_size;
if (stub_group_size == 1)
{
/* Default values. */
- stub_group_size = 8000000;
- if (hplink->has_17bit_branch || hplink->multi_subspace)
- stub_group_size = 250000;
- if (hplink->has_12bit_branch)
- stub_group_size = 7812;
+ stub_group_size = 7680000;
+ if (htab->has_17bit_branch || htab->multi_subspace)
+ stub_group_size = 240000;
+ if (htab->has_12bit_branch)
+ stub_group_size = 7500;
}
/* Count the number of input BFDs and find the top input section id. */
}
amt = sizeof (struct map_stub) * (top_id + 1);
- hplink->stub_group = (struct map_stub *) bfd_zmalloc (amt);
- if (hplink->stub_group == NULL)
+ htab->stub_group = (struct map_stub *) bfd_zmalloc (amt);
+ if (htab->stub_group == NULL)
return false;
/* Make a list of input sections for each output section included in
if (*list != bfd_abs_section_ptr)
{
/* Steal the link_sec pointer for our list. */
-#define PREV_SEC(sec) (hplink->stub_group[(sec)->id].link_sec)
+#define PREV_SEC(sec) (htab->stub_group[(sec)->id].link_sec)
/* This happens to make the list in reverse order,
which is what we want. */
PREV_SEC (section) = *list;
curr = prev;
/* OK, the size from the start of CURR to the end is less
- than 250000 bytes and thus can be handled by one stub
+ than 240000 bytes and thus can be handled by one stub
section. (or the tail section is itself larger than
- 250000 bytes, in which case we may be toast.)
+ 240000 bytes, in which case we may be toast.)
We should really be keeping track of the total size of
stubs added here, as stubs contribute to the final output
section size. That's a little tricky, and this way will
- only break if stubs added total more than 12144 bytes, or
- 1518 long branch stubs. It seems unlikely for more than
- 1518 different functions to be called, especially from
- code only 250000 bytes long. */
+ only break if stubs added total more than 22144 bytes, or
+ 2768 long branch stubs. It seems unlikely for more than
+ 2768 different functions to be called, especially from
+ code only 240000 bytes long. This limit used to be
+ 250000, but c++ code tends to generate lots of little
+ functions, and sometimes violated the assumption. */
do
{
prev = PREV_SEC (tail);
/* Set up this stub group. */
- hplink->stub_group[tail->id].link_sec = curr;
+ htab->stub_group[tail->id].link_sec = curr;
}
while (tail != curr && (tail = prev) != NULL);
- /* But wait, there's more! Input sections up to 250000
+ /* But wait, there's more! Input sections up to 240000
bytes before the stub section can be handled by it too. */
if (!stubs_always_before_branch)
{
{
tail = prev;
prev = PREV_SEC (tail);
- hplink->stub_group[tail->id].link_sec = curr;
+ htab->stub_group[tail->id].link_sec = curr;
}
}
tail = prev;
input_bfd = input_bfd->link_next, bfd_indx++)
{
Elf_Internal_Shdr *symtab_hdr;
+ Elf_Internal_Shdr *shndx_hdr;
Elf_Internal_Sym *isym;
Elf32_External_Sym *ext_syms, *esym, *end_sy;
+ Elf_External_Sym_Shndx *shndx_buf, *shndx;
bfd_size_type sec_size;
/* We'll need the symbol table in a second. */
sec_size *= sizeof (Elf_Internal_Sym);
local_syms = (Elf_Internal_Sym *) bfd_malloc (sec_size);
if (local_syms == NULL)
- {
- goto error_ret_free_local;
- }
+ goto error_ret_free_local;
+
all_local_syms[bfd_indx] = local_syms;
sec_size = symtab_hdr->sh_info;
sec_size *= sizeof (Elf32_External_Sym);
ext_syms = (Elf32_External_Sym *) bfd_malloc (sec_size);
if (ext_syms == NULL)
- {
- goto error_ret_free_local;
- }
+ goto error_ret_free_local;
if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
- || (bfd_bread (ext_syms, sec_size, input_bfd) != sec_size))
+ || bfd_bread ((PTR) ext_syms, sec_size, input_bfd) != sec_size)
{
+ error_ret_free_ext_syms:
free (ext_syms);
goto error_ret_free_local;
}
+ shndx_buf = NULL;
+ shndx_hdr = &elf_tdata (input_bfd)->symtab_shndx_hdr;
+ if (shndx_hdr->sh_size != 0)
+ {
+ sec_size = symtab_hdr->sh_info;
+ sec_size *= sizeof (Elf_External_Sym_Shndx);
+ shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (sec_size);
+ if (shndx_buf == NULL)
+ goto error_ret_free_ext_syms;
+
+ if (bfd_seek (input_bfd, shndx_hdr->sh_offset, SEEK_SET) != 0
+ || bfd_bread ((PTR) shndx_buf, sec_size, input_bfd) != sec_size)
+ {
+ free (shndx_buf);
+ goto error_ret_free_ext_syms;
+ }
+ }
+
/* Swap the local symbols in. */
- isym = local_syms;
- esym = ext_syms;
- for (end_sy = esym + symtab_hdr->sh_info; esym < end_sy; esym++, isym++)
- bfd_elf32_swap_symbol_in (input_bfd, esym, isym);
+ for (esym = ext_syms, end_sy = esym + symtab_hdr->sh_info,
+ isym = local_syms, shndx = shndx_buf;
+ esym < end_sy;
+ esym++, isym++, shndx = (shndx ? shndx + 1 : NULL))
+ bfd_elf32_swap_symbol_in (input_bfd, esym, shndx, isym);
/* Now we can free the external symbols. */
+ free (shndx_buf);
free (ext_syms);
- if (info->shared && hplink->multi_subspace)
+ if (info->shared && htab->multi_subspace)
{
struct elf_link_hash_entry **sym_hashes;
struct elf_link_hash_entry **end_hashes;
sec = hash->elf.root.u.def.section;
stub_name = hash->elf.root.root.string;
- stub_entry = hppa_stub_hash_lookup (&hplink->stub_hash_table,
+ stub_entry = hppa_stub_hash_lookup (&htab->stub_hash_table,
stub_name,
false, false);
if (stub_entry == NULL)
{
- stub_entry = hppa_add_stub (stub_name, sec, hplink);
+ stub_entry = hppa_add_stub (stub_name, sec, htab);
if (!stub_entry)
goto error_ret_free_local;
/* Read in the external relocs. */
input_rel_hdr = &elf_section_data (section)->rel_hdr;
if (bfd_seek (input_bfd, input_rel_hdr->sh_offset, SEEK_SET) != 0
- || bfd_bread (external_relocs,
- input_rel_hdr->sh_size,
- input_bfd) != input_rel_hdr->sh_size)
+ || bfd_bread ((PTR) external_relocs,
+ input_rel_hdr->sh_size,
+ input_bfd) != input_rel_hdr->sh_size)
{
free (external_relocs);
error_ret_free_internal:
if (! (info->shared
&& !info->no_undefined
&& (ELF_ST_VISIBILITY (hash->elf.other)
- == STV_DEFAULT)))
+ == STV_DEFAULT)
+ && hash->elf.type != STT_PARISC_MILLI))
continue;
}
else
continue;
/* Support for grouping stub sections. */
- id_sec = hplink->stub_group[section->id].link_sec;
+ id_sec = htab->stub_group[section->id].link_sec;
/* Get the name of this stub. */
stub_name = hppa_stub_name (id_sec, sym_sec, hash, irela);
if (!stub_name)
goto error_ret_free_internal;
- stub_entry = hppa_stub_hash_lookup (&hplink->stub_hash_table,
+ stub_entry = hppa_stub_hash_lookup (&htab->stub_hash_table,
stub_name,
false, false);
if (stub_entry != NULL)
continue;
}
- stub_entry = hppa_add_stub (stub_name, section, hplink);
+ stub_entry = hppa_add_stub (stub_name, section, htab);
if (stub_entry == NULL)
{
free (stub_name);
/* OK, we've added some stubs. Find out the new size of the
stub sections. */
- for (stub_sec = hplink->stub_bfd->sections;
+ for (stub_sec = htab->stub_bfd->sections;
stub_sec != NULL;
stub_sec = stub_sec->next)
{
stub_sec->_cooked_size = 0;
}
- bfd_hash_traverse (&hplink->stub_hash_table,
- hppa_size_one_stub,
- hplink);
+ bfd_hash_traverse (&htab->stub_hash_table, hppa_size_one_stub, htab);
/* Ask the linker to do its stuff. */
- (*hplink->layout_sections_again) ();
+ (*htab->layout_sections_again) ();
stub_changed = 0;
}
bfd *abfd;
struct bfd_link_info *info;
{
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
struct elf_link_hash_entry *h;
asection *sec;
bfd_vma gp_val;
- hplink = hppa_link_hash_table (info);
- h = elf_link_hash_lookup (&hplink->root, "$global$",
- false, false, false);
+ htab = hppa_link_hash_table (info);
+ h = elf_link_hash_lookup (&htab->elf, "$global$", false, false, false);
if (h != NULL
&& (h->root.type == bfd_link_hash_defined
the .plt and .got are smaller than 0x2000, choose the end of
the .plt section. */
- sec = hplink->splt;
+ sec = htab->splt;
if (sec != NULL)
{
gp_val = sec->_raw_size;
if (gp_val > 0x2000
- || (hplink->sgot && hplink->sgot->_raw_size > 0x2000))
+ || (htab->sgot && htab->sgot->_raw_size > 0x2000))
{
gp_val = 0x2000;
}
else
{
gp_val = 0;
- sec = hplink->sgot;
+ sec = htab->sgot;
if (sec != NULL)
{
/* We know we don't have a .plt. If .got is large,
{
asection *stub_sec;
struct bfd_hash_table *table;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
- hplink = hppa_link_hash_table (info);
+ htab = hppa_link_hash_table (info);
- for (stub_sec = hplink->stub_bfd->sections;
+ for (stub_sec = htab->stub_bfd->sections;
stub_sec != NULL;
stub_sec = stub_sec->next)
{
/* Allocate memory to hold the linker stubs. */
size = stub_sec->_raw_size;
- stub_sec->contents = (unsigned char *) bfd_zalloc (hplink->stub_bfd,
- size);
+ stub_sec->contents = (unsigned char *) bfd_zalloc (htab->stub_bfd, size);
if (stub_sec->contents == NULL && size != 0)
return false;
stub_sec->_raw_size = 0;
}
/* Build the stubs as directed by the stub hash table. */
- table = &hplink->stub_hash_table;
+ table = &htab->stub_hash_table;
bfd_hash_traverse (table, hppa_build_one_stub, info);
return true;
asection *section;
PTR data;
{
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
- hplink = (struct elf32_hppa_link_hash_table *) data;
+ htab = (struct elf32_hppa_link_hash_table *) data;
if ((section->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
{
if ((section->flags & SEC_READONLY) != 0)
{
- if (value < hplink->text_segment_base)
- hplink->text_segment_base = value;
+ if (value < htab->text_segment_base)
+ htab->text_segment_base = value;
}
else
{
- if (value < hplink->data_segment_base)
- hplink->data_segment_base = value;
+ if (value < htab->data_segment_base)
+ htab->data_segment_base = value;
}
}
}
/* Perform a relocation as part of a final link. */
static bfd_reloc_status_type
-final_link_relocate (input_section, contents, rel, value, hplink, sym_sec, h)
+final_link_relocate (input_section, contents, rel, value, htab, sym_sec, h)
asection *input_section;
bfd_byte *contents;
const Elf_Internal_Rela *rel;
bfd_vma value;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
asection *sym_sec;
struct elf32_hppa_link_hash_entry *h;
{
&& h->elf.plt.offset != (bfd_vma) -1))))
{
stub_entry = hppa_get_stub_entry (input_section, sym_sec,
- h, rel, hplink);
+ h, rel, htab);
if (stub_entry != NULL)
{
value = (stub_entry->stub_offset
addend = 8;
}
else
- return bfd_reloc_notsupported;
+ return bfd_reloc_undefined;
}
/* Fall thru. */
case R_PARISC_SEGREL32:
if ((sym_sec->flags & SEC_CODE) != 0)
- value -= hplink->text_segment_base;
+ value -= htab->text_segment_base;
else
- value -= hplink->data_segment_base;
+ value -= htab->data_segment_base;
break;
default:
if (value + addend + max_branch_offset >= 2*max_branch_offset)
{
stub_entry = hppa_get_stub_entry (input_section, sym_sec,
- h, rel, hplink);
+ h, rel, htab);
if (stub_entry == NULL)
- return bfd_reloc_notsupported;
+ return bfd_reloc_undefined;
/* Munge up the value and addend so that we call the stub
rather than the procedure directly. */
input_section->name,
(long) rel->r_offset,
stub_entry->root.string);
+ bfd_set_error (bfd_error_bad_value);
return bfd_reloc_notsupported;
}
Elf_Internal_Sym *local_syms;
asection **local_sections;
{
- bfd *dynobj;
bfd_vma *local_got_offsets;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
Elf_Internal_Shdr *symtab_hdr;
Elf_Internal_Rela *rel;
Elf_Internal_Rela *relend;
symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
- hplink = hppa_link_hash_table (info);
- dynobj = hplink->root.dynobj;
+ htab = hppa_link_hash_table (info);
local_got_offsets = elf_local_got_offsets (input_bfd);
rel = relocs;
bfd_reloc_status_type r;
const char *sym_name;
boolean plabel;
- bfd_vma off;
+ boolean warned_undef;
r_type = ELF32_R_TYPE (rel->r_info);
if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
if (info->relocateable)
{
- /* This is a relocateable link. We don't have to change
+ /* This is a relocatable link. We don't have to change
anything, unless the reloc is against a section symbol,
in which case we have to adjust according to where the
section symbol winds up in the output section. */
h = NULL;
sym = NULL;
sym_sec = NULL;
+ warned_undef = false;
if (r_symndx < symtab_hdr->sh_info)
{
/* This is a local symbol, h defaults to NULL. */
sym = local_syms + r_symndx;
sym_sec = local_sections[r_symndx];
- relocation = ((ELF_ST_TYPE (sym->st_info) == STT_SECTION
- ? 0 : sym->st_value)
- + sym_sec->output_offset
- + sym_sec->output_section->vma);
+ relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sym_sec, rel);
}
else
{
&& h->elf.type != STT_PARISC_MILLI)
{
if (info->symbolic && !info->allow_shlib_undefined)
- if (!((*info->callbacks->undefined_symbol)
- (info, h->elf.root.root.string, input_bfd,
- input_section, rel->r_offset, false)))
- return false;
+ {
+ if (!((*info->callbacks->undefined_symbol)
+ (info, h->elf.root.root.string, input_bfd,
+ input_section, rel->r_offset, false)))
+ return false;
+ warned_undef = true;
+ }
}
else
{
(info, h->elf.root.root.string, input_bfd,
input_section, rel->r_offset, true)))
return false;
+ warned_undef = true;
}
}
case R_PARISC_DLTIND14F:
case R_PARISC_DLTIND14R:
case R_PARISC_DLTIND21L:
- /* Relocation is to the entry for this symbol in the global
- offset table. */
- if (h != NULL)
- {
- boolean dyn;
-
- off = h->elf.got.offset;
- dyn = hplink->root.dynamic_sections_created;
- if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, &h->elf))
- {
- /* This is actually a static link, or it is a
- -Bsymbolic link and the symbol is defined
- locally, or the symbol was forced to be local
- because of a version file. We must initialize
- this entry in the global offset table. Since the
- offset must always be a multiple of 4, we use the
- least significant bit to record whether we have
- initialized it already.
-
- When doing a dynamic link, we create a .rela.got
- relocation entry to initialize the value. This
- is done in the finish_dynamic_symbol routine. */
- if ((off & 1) != 0)
- off &= ~1;
- else
- {
- bfd_put_32 (output_bfd, relocation,
- hplink->sgot->contents + off);
- h->elf.got.offset |= 1;
- }
- }
- }
- else
- {
- /* Local symbol case. */
- if (local_got_offsets == NULL)
- abort ();
-
- off = local_got_offsets[r_symndx];
-
- /* The offset must always be a multiple of 4. We use
- the least significant bit to record whether we have
- already generated the necessary reloc. */
- if ((off & 1) != 0)
- off &= ~1;
- else
- {
+ {
+ bfd_vma off;
+ boolean do_got = 0;
+
+ /* Relocation is to the entry for this symbol in the
+ global offset table. */
+ if (h != NULL)
+ {
+ boolean dyn;
+
+ off = h->elf.got.offset;
+ dyn = htab->elf.dynamic_sections_created;
+ if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, &h->elf))
+ {
+ /* If we aren't going to call finish_dynamic_symbol,
+ then we need to handle initialisation of the .got
+ entry and create needed relocs here. Since the
+ offset must always be a multiple of 4, we use the
+ least significant bit to record whether we have
+ initialised it already. */
+ if ((off & 1) != 0)
+ off &= ~1;
+ else
+ {
+ h->elf.got.offset |= 1;
+ do_got = 1;
+ }
+ }
+ }
+ else
+ {
+ /* Local symbol case. */
+ if (local_got_offsets == NULL)
+ abort ();
+
+ off = local_got_offsets[r_symndx];
+
+ /* The offset must always be a multiple of 4. We use
+ the least significant bit to record whether we have
+ already generated the necessary reloc. */
+ if ((off & 1) != 0)
+ off &= ~1;
+ else
+ {
+ local_got_offsets[r_symndx] |= 1;
+ do_got = 1;
+ }
+ }
+
+ if (do_got)
+ {
+ if (info->shared)
+ {
+ /* Output a dynamic relocation for this GOT entry.
+ In this case it is relative to the base of the
+ object because the symbol index is zero. */
+ Elf_Internal_Rela outrel;
+ asection *srelgot = htab->srelgot;
+ Elf32_External_Rela *loc;
+
+ outrel.r_offset = (off
+ + htab->sgot->output_offset
+ + htab->sgot->output_section->vma);
+ outrel.r_info = ELF32_R_INFO (0, R_PARISC_DIR32);
+ outrel.r_addend = relocation;
+ loc = (Elf32_External_Rela *) srelgot->contents;
+ loc += srelgot->reloc_count++;
+ bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+ }
+ else
bfd_put_32 (output_bfd, relocation,
- hplink->sgot->contents + off);
-
- if (info->shared)
- {
- /* Output a dynamic relocation for this GOT
- entry. In this case it is relative to the
- base of the object because the symbol index
- is zero. */
- Elf_Internal_Rela outrel;
- asection *srelgot = hplink->srelgot;
+ htab->sgot->contents + off);
+ }
- outrel.r_offset = (off
- + hplink->sgot->output_offset
- + hplink->sgot->output_section->vma);
- outrel.r_info = ELF32_R_INFO (0, R_PARISC_DIR32);
- outrel.r_addend = relocation;
- bfd_elf32_swap_reloca_out (output_bfd, &outrel,
- ((Elf32_External_Rela *)
- srelgot->contents
- + srelgot->reloc_count));
- ++srelgot->reloc_count;
- }
-
- local_got_offsets[r_symndx] |= 1;
- }
- }
-
- if (off >= (bfd_vma) -2)
- abort ();
+ if (off >= (bfd_vma) -2)
+ abort ();
- /* Add the base of the GOT to the relocation value. */
- relocation = (off
- + hplink->sgot->output_offset
- + hplink->sgot->output_section->vma);
+ /* Add the base of the GOT to the relocation value. */
+ relocation = (off
+ + htab->sgot->output_offset
+ + htab->sgot->output_section->vma);
+ }
break;
case R_PARISC_SEGREL32:
/* If this is the first SEGREL relocation, then initialize
the segment base values. */
- if (hplink->text_segment_base == (bfd_vma) -1)
- bfd_map_over_sections (output_bfd,
- hppa_record_segment_addr,
- hplink);
+ if (htab->text_segment_base == (bfd_vma) -1)
+ bfd_map_over_sections (output_bfd, hppa_record_segment_addr, htab);
break;
case R_PARISC_PLABEL14R:
case R_PARISC_PLABEL21L:
case R_PARISC_PLABEL32:
- if (hplink->root.dynamic_sections_created)
+ if (htab->elf.dynamic_sections_created)
{
+ bfd_vma off;
+ boolean do_plt = 0;
+
/* If we have a global symbol with a PLT slot, then
redirect this relocation to it. */
if (h != NULL)
off &= ~1;
else
{
- bfd_put_32 (output_bfd,
- relocation,
- hplink->splt->contents + off);
- bfd_put_32 (output_bfd,
- elf_gp (hplink->splt->output_section->owner),
- hplink->splt->contents + off + 4);
h->elf.plt.offset |= 1;
+ do_plt = 1;
}
}
}
this local .plt entry. */
if ((off & 1) != 0)
off &= ~1;
+ else
+ {
+ local_plt_offsets[r_symndx] |= 1;
+ do_plt = 1;
+ }
+ }
+
+ if (do_plt)
+ {
+ if (info->shared)
+ {
+ /* Output a dynamic IPLT relocation for this
+ PLT entry. */
+ Elf_Internal_Rela outrel;
+ asection *srelplt = htab->srelplt;
+ Elf32_External_Rela *loc;
+
+ outrel.r_offset = (off
+ + htab->splt->output_offset
+ + htab->splt->output_section->vma);
+ outrel.r_info = ELF32_R_INFO (0, R_PARISC_IPLT);
+ outrel.r_addend = relocation;
+ loc = (Elf32_External_Rela *) srelplt->contents;
+ loc += srelplt->reloc_count++;
+ bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+ }
else
{
bfd_put_32 (output_bfd,
relocation,
- hplink->splt->contents + off);
+ htab->splt->contents + off);
bfd_put_32 (output_bfd,
- elf_gp (hplink->splt->output_section->owner),
- hplink->splt->contents + off + 4);
-
- if (info->shared)
- {
- /* Output a dynamic IPLT relocation for this
- PLT entry. */
- Elf_Internal_Rela outrel;
- asection *srelplt = hplink->srelplt;
-
- outrel.r_offset = (off
- + hplink->splt->output_offset
- + hplink->splt->output_section->vma);
- outrel.r_info = ELF32_R_INFO (0, R_PARISC_IPLT);
- outrel.r_addend = relocation;
- bfd_elf32_swap_reloca_out (output_bfd, &outrel,
- ((Elf32_External_Rela *)
- srelplt->contents
- + srelplt->reloc_count));
- ++srelplt->reloc_count;
- }
-
- local_plt_offsets[r_symndx] |= 1;
+ elf_gp (htab->splt->output_section->owner),
+ htab->splt->contents + off + 4);
}
}
&& h->elf.root.type != bfd_link_hash_undefined))
{
relocation = (off
- + hplink->splt->output_offset
- + hplink->splt->output_section->vma
+ + htab->splt->output_offset
+ + htab->splt->output_section->vma
+ 2);
}
plabel = 1;
case R_PARISC_DPREL14R:
case R_PARISC_DPREL21L:
case R_PARISC_DIR32:
+ /* r_symndx will be zero only for relocs against symbols
+ from removed linkonce sections, or sections discarded by
+ a linker script. */
+ if (r_symndx == 0
+ || (input_section->flags & SEC_ALLOC) == 0)
+ break;
+
/* The reloc types handled here and this conditional
expression must match the code in ..check_relocs and
- ..discard_relocs. ie. We need exactly the same condition
+ allocate_dynrelocs. ie. We need exactly the same condition
as in ..check_relocs, with some extra conditions (dynindx
test in this case) to cater for relocs removed by
- ..discard_relocs. If you squint, the non-shared test
+ allocate_dynrelocs. If you squint, the non-shared test
here does indeed match the one in ..check_relocs, the
difference being that here we test DEF_DYNAMIC as well as
!DEF_REGULAR. All common syms end up with !DEF_REGULAR,
Conversely, DEF_DYNAMIC can't be used in check_relocs as
there all files have not been loaded. */
if ((info->shared
- && (input_section->flags & SEC_ALLOC) != 0
&& (IS_ABSOLUTE_RELOC (r_type)
|| (h != NULL
&& h->elf.dynindx != -1
|| (h->elf.elf_link_hash_flags
& ELF_LINK_HASH_DEF_REGULAR) == 0))))
|| (!info->shared
- && (input_section->flags & SEC_ALLOC) != 0
&& h != NULL
&& h->elf.dynindx != -1
&& (h->elf.elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
are copied into the output file to be resolved at run
time. */
- outrel.r_offset = rel->r_offset;
outrel.r_addend = rel->r_addend;
- skip = false;
- if (elf_section_data (input_section)->stab_info != NULL)
- {
- off = (_bfd_stab_section_offset
- (output_bfd, &hplink->root.stab_info,
- input_section,
- &elf_section_data (input_section)->stab_info,
- rel->r_offset));
- if (off == (bfd_vma) -1)
- skip = true;
- outrel.r_offset = off;
- }
-
+ outrel.r_offset =
+ _bfd_elf_section_offset (output_bfd, info, input_section,
+ rel->r_offset);
+ skip = (outrel.r_offset == (bfd_vma) -1);
outrel.r_offset += (input_section->output_offset
+ input_section->output_section->vma);
if (sreloc == NULL)
abort ();
- loc = ((Elf32_External_Rela *) sreloc->contents
- + sreloc->reloc_count);
- sreloc->reloc_count += 1;
+ loc = (Elf32_External_Rela *) sreloc->contents;
+ loc += sreloc->reloc_count++;
bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
}
break;
}
r = final_link_relocate (input_section, contents, rel, relocation,
- hplink, sym_sec, h);
+ htab, sym_sec, h);
if (r == bfd_reloc_ok)
continue;
if (r == bfd_reloc_undefined || r == bfd_reloc_notsupported)
{
- (*_bfd_error_handler)
- (_("%s(%s+0x%lx): cannot handle %s for %s"),
- bfd_archive_filename (input_bfd),
- input_section->name,
- (long) rel->r_offset,
- howto->name,
- sym_name);
- bfd_set_error (bfd_error_bad_value);
- return false;
+ if (r == bfd_reloc_notsupported || !warned_undef)
+ {
+ (*_bfd_error_handler)
+ (_("%s(%s+0x%lx): cannot handle %s for %s"),
+ bfd_archive_filename (input_bfd),
+ input_section->name,
+ (long) rel->r_offset,
+ howto->name,
+ sym_name);
+ bfd_set_error (bfd_error_bad_value);
+ return false;
+ }
}
else
{
struct elf_link_hash_entry *h;
Elf_Internal_Sym *sym;
{
- struct elf32_hppa_link_hash_table *hplink;
- bfd *dynobj;
+ struct elf32_hppa_link_hash_table *htab;
- hplink = hppa_link_hash_table (info);
- dynobj = hplink->root.dynobj;
+ htab = hppa_link_hash_table (info);
if (h->plt.offset != (bfd_vma) -1)
{
if (! ((struct elf32_hppa_link_hash_entry *) h)->pic_call)
{
Elf_Internal_Rela rel;
+ Elf32_External_Rela *loc;
/* Create a dynamic IPLT relocation for this entry. */
rel.r_offset = (h->plt.offset
- + hplink->splt->output_offset
- + hplink->splt->output_section->vma);
- if (! ((struct elf32_hppa_link_hash_entry *) h)->plt_abs
- && h->dynindx != -1)
+ + htab->splt->output_offset
+ + htab->splt->output_section->vma);
+ if (h->dynindx != -1)
{
- /* To support lazy linking, the function pointer is
- initialised to point to a special stub stored at the
- end of the .plt. This is not done for plt entries
- with a base-relative dynamic relocation. */
- value = (hplink->splt->output_offset
- + hplink->splt->output_section->vma
- + hplink->splt->_raw_size
- - sizeof (plt_stub)
- + PLT_STUB_ENTRY);
rel.r_info = ELF32_R_INFO (h->dynindx, R_PARISC_IPLT);
rel.r_addend = 0;
}
rel.r_addend = value;
}
- bfd_elf32_swap_reloca_out (hplink->splt->output_section->owner,
- &rel,
- ((Elf32_External_Rela *)
- hplink->srelplt->contents
- + hplink->srelplt->reloc_count));
- hplink->srelplt->reloc_count++;
+ loc = (Elf32_External_Rela *) htab->srelplt->contents;
+ loc += htab->srelplt->reloc_count++;
+ bfd_elf32_swap_reloca_out (htab->splt->output_section->owner,
+ &rel, loc);
}
-
- bfd_put_32 (hplink->splt->owner,
- value,
- hplink->splt->contents + h->plt.offset);
- bfd_put_32 (hplink->splt->owner,
- elf_gp (hplink->splt->output_section->owner),
- hplink->splt->contents + h->plt.offset + 4);
- if (PLABEL_PLT_ENTRY_SIZE != PLT_ENTRY_SIZE
- && ((struct elf32_hppa_link_hash_entry *) h)->plabel
- && h->dynindx != -1)
+ else
{
- memset (hplink->splt->contents + h->plt.offset + 8,
- 0, PLABEL_PLT_ENTRY_SIZE - PLT_ENTRY_SIZE);
+ bfd_put_32 (htab->splt->owner,
+ value,
+ htab->splt->contents + h->plt.offset);
+ bfd_put_32 (htab->splt->owner,
+ elf_gp (htab->splt->output_section->owner),
+ htab->splt->contents + h->plt.offset + 4);
}
if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
if (h->got.offset != (bfd_vma) -1)
{
Elf_Internal_Rela rel;
+ Elf32_External_Rela *loc;
/* This symbol has an entry in the global offset table. Set it
up. */
rel.r_offset = ((h->got.offset &~ (bfd_vma) 1)
- + hplink->sgot->output_offset
- + hplink->sgot->output_section->vma);
+ + htab->sgot->output_offset
+ + htab->sgot->output_section->vma);
/* If this is a -Bsymbolic link and the symbol is defined
locally or was forced to be local because of a version file,
if ((h->got.offset & 1) != 0)
abort ();
bfd_put_32 (output_bfd, (bfd_vma) 0,
- hplink->sgot->contents + h->got.offset);
+ htab->sgot->contents + h->got.offset);
rel.r_info = ELF32_R_INFO (h->dynindx, R_PARISC_DIR32);
rel.r_addend = 0;
}
- bfd_elf32_swap_reloca_out (output_bfd, &rel,
- ((Elf32_External_Rela *)
- hplink->srelgot->contents
- + hplink->srelgot->reloc_count));
- ++hplink->srelgot->reloc_count;
+ loc = (Elf32_External_Rela *) htab->srelgot->contents;
+ loc += htab->srelgot->reloc_count++;
+ bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
}
if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
{
asection *s;
Elf_Internal_Rela rel;
+ Elf32_External_Rela *loc;
/* This symbol needs a copy reloc. Set it up. */
|| h->root.type == bfd_link_hash_defweak)))
abort ();
- s = hplink->srelbss;
+ s = htab->srelbss;
rel.r_offset = (h->root.u.def.value
+ h->root.u.def.section->output_offset
+ h->root.u.def.section->output_section->vma);
rel.r_addend = 0;
rel.r_info = ELF32_R_INFO (h->dynindx, R_PARISC_COPY);
- bfd_elf32_swap_reloca_out (output_bfd, &rel,
- ((Elf32_External_Rela *) s->contents
- + s->reloc_count));
- ++s->reloc_count;
+ loc = (Elf32_External_Rela *) s->contents + s->reloc_count++;
+ bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
}
/* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute. */
struct bfd_link_info *info;
{
bfd *dynobj;
- struct elf32_hppa_link_hash_table *hplink;
+ struct elf32_hppa_link_hash_table *htab;
asection *sdyn;
- hplink = hppa_link_hash_table (info);
- dynobj = hplink->root.dynobj;
+ htab = hppa_link_hash_table (info);
+ dynobj = htab->elf.dynobj;
sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
- if (hplink->root.dynamic_sections_created)
+ if (htab->elf.dynamic_sections_created)
{
Elf32_External_Dyn *dyncon, *dynconend;
switch (dyn.d_tag)
{
default:
- break;
+ continue;
case DT_PLTGOT:
/* Use PLTGOT to set the GOT register. */
dyn.d_un.d_ptr = elf_gp (output_bfd);
- bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
break;
case DT_JMPREL:
- s = hplink->srelplt;
+ s = htab->srelplt;
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 = hplink->srelplt;
+ s = htab->srelplt;
if (s->_cooked_size != 0)
dyn.d_un.d_val = s->_cooked_size;
else
dyn.d_un.d_val = s->_raw_size;
- bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+ break;
+
+ case DT_RELASZ:
+ /* Don't count procedure linkage table relocs in the
+ overall reloc count. */
+ if (htab->srelplt != NULL)
+ {
+ s = htab->srelplt->output_section;
+ if (s->_cooked_size != 0)
+ dyn.d_un.d_val -= s->_cooked_size;
+ else
+ dyn.d_un.d_val -= s->_raw_size;
+ }
break;
}
+
+ bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
}
}
- if (hplink->sgot != NULL && hplink->sgot->_raw_size != 0)
+ if (htab->sgot != NULL && htab->sgot->_raw_size != 0)
{
/* Fill in the first entry in the global offset table.
We use it to point to our dynamic section, if we have one. */
(sdyn != NULL
? sdyn->output_section->vma + sdyn->output_offset
: (bfd_vma) 0),
- hplink->sgot->contents);
+ htab->sgot->contents);
/* The second entry is reserved for use by the dynamic linker. */
- memset (hplink->sgot->contents + GOT_ENTRY_SIZE, 0, GOT_ENTRY_SIZE);
+ memset (htab->sgot->contents + GOT_ENTRY_SIZE, 0, GOT_ENTRY_SIZE);
/* Set .got entry size. */
- elf_section_data (hplink->sgot->output_section)
+ elf_section_data (htab->sgot->output_section)
->this_hdr.sh_entsize = GOT_ENTRY_SIZE;
}
- if (hplink->splt != NULL && hplink->splt->_raw_size != 0)
+ if (htab->splt != NULL && htab->splt->_raw_size != 0)
{
/* Set plt entry size. */
- elf_section_data (hplink->splt->output_section)
+ elf_section_data (htab->splt->output_section)
->this_hdr.sh_entsize = PLT_ENTRY_SIZE;
- if (hplink->need_plt_stub)
+ if (htab->need_plt_stub)
{
/* Set up the .plt stub. */
- memcpy (hplink->splt->contents
- + hplink->splt->_raw_size - sizeof (plt_stub),
+ memcpy (htab->splt->contents
+ + htab->splt->_raw_size - sizeof (plt_stub),
plt_stub, sizeof (plt_stub));
- if ((hplink->splt->output_offset
- + hplink->splt->output_section->vma
- + hplink->splt->_raw_size)
- != (hplink->sgot->output_offset
- + hplink->sgot->output_section->vma))
+ if ((htab->splt->output_offset
+ + htab->splt->output_section->vma
+ + htab->splt->_raw_size)
+ != (htab->sgot->output_offset
+ + htab->sgot->output_section->vma))
{
(*_bfd_error_handler)
(_(".got section not immediately after .plt section"));
#define bfd_elf32_bfd_link_hash_table_create elf32_hppa_link_hash_table_create
#define elf_backend_add_symbol_hook elf32_hppa_add_symbol_hook
#define elf_backend_adjust_dynamic_symbol elf32_hppa_adjust_dynamic_symbol
+#define elf_backend_copy_indirect_symbol elf32_hppa_copy_indirect_symbol
#define elf_backend_check_relocs elf32_hppa_check_relocs
#define elf_backend_create_dynamic_sections elf32_hppa_create_dynamic_sections
#define elf_backend_fake_sections elf_hppa_fake_sections
#define elf_backend_reloc_type_class elf32_hppa_reloc_type_class
#define elf_backend_can_gc_sections 1
+#define elf_backend_can_refcount 1
#define elf_backend_plt_alignment 2
#define elf_backend_want_got_plt 0
#define elf_backend_plt_readonly 0
projects / deliverable / binutils-gdb.git / blobdiff