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);
}
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)
{
struct elf32_hppa_link_hash_table *htab;
- unsigned short oldflags = h->elf_link_hash_flags;
h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
elf32_hppa_hide_symbol (info, h);
htab = hppa_link_hash_table (info);
_bfd_elf_strtab_delref (htab->elf.dynstr, h->dynstr_index);
+
+ /* ?!? 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;
}
if (stub_group_size == 1)
{
/* Default values. */
- stub_group_size = 8000000;
+ stub_group_size = 7680000;
if (htab->has_17bit_branch || htab->multi_subspace)
- stub_group_size = 250000;
+ stub_group_size = 240000;
if (htab->has_12bit_branch)
- stub_group_size = 7812;
+ stub_group_size = 7500;
}
/* Count the number of input BFDs and find the top input section id. */
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);
}
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)
{
addend = 8;
}
else
- return bfd_reloc_notsupported;
+ return bfd_reloc_undefined;
}
/* Fall thru. */
stub_entry = hppa_get_stub_entry (input_section, sym_sec,
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. */
bfd_reloc_status_type r;
const char *sym_name;
boolean plabel;
+ boolean warned_undef;
r_type = ELF32_R_TYPE (rel->r_info);
if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
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;
}
}
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)
- {
- bfd_vma off;
-
- off = (_bfd_stab_section_offset
- (output_bfd, &htab->elf.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 (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
{
projects / deliverable / binutils-gdb.git / blobdiff