Don't make symbols dynamic other than undef weak

Fixes: tmpdir/pr14525: symbol lookup error: tmpdir/pr14525: undefined
symbol: __executable_start
FAIL: PIE PR ld/14525

	* elf32-hppa.c (ensure_undef_weak_dynamic): New function.
	(allocate_plt_static, allocate_dynrelocs): Use it.
This commit is contained in:
Alan Modra 2017-01-02 22:31:27 +10:30
parent 7bd9df3bcd
commit 595e0a47f5
2 changed files with 28 additions and 35 deletions

View File

@ -1,3 +1,8 @@
2017-01-02 Alan Modra <amodra@gmail.com>
* elf32-hppa.c (ensure_undef_weak_dynamic): New function.
(allocate_plt_static, allocate_dynrelocs): Use it.
2017-01-02 Alan Modra <amodra@gmail.com>
* elf-hppa.h (elf_hppa_fake_sections): Set SHF_INFO_LINK for

View File

@ -1919,6 +1919,21 @@ elf32_hppa_adjust_dynamic_symbol (struct bfd_link_info *info,
return _bfd_elf_adjust_dynamic_copy (info, eh, sec);
}
/* Make an undefined weak symbol dynamic. */
static bfd_boolean
ensure_undef_weak_dynamic (struct bfd_link_info *info,
struct elf_link_hash_entry *eh)
{
if (eh->dynindx == -1
&& !eh->forced_local
&& eh->type != STT_PARISC_MILLI
&& eh->root.type == bfd_link_hash_undefweak
&& ELF_ST_VISIBILITY (eh->other) == STV_DEFAULT)
return bfd_elf_link_record_dynamic_symbol (info, eh);
return TRUE;
}
/* Allocate space in the .plt for entries that won't have relocations.
ie. plabel entries. */
@ -1942,15 +1957,8 @@ allocate_plt_static (struct elf_link_hash_entry *eh, void *inf)
if (htab->etab.dynamic_sections_created
&& eh->plt.refcount > 0)
{
/* Make sure this symbol is output as a dynamic symbol.
Undefined weak syms won't yet be marked as dynamic. */
if (eh->dynindx == -1
&& !eh->forced_local
&& eh->type != STT_PARISC_MILLI)
{
if (! bfd_elf_link_record_dynamic_symbol (info, eh))
return FALSE;
}
if (!ensure_undef_weak_dynamic (info, eh))
return FALSE;
if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), eh))
{
@ -2024,15 +2032,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf)
if (eh->got.refcount > 0)
{
/* Make sure this symbol is output as a dynamic symbol.
Undefined weak syms won't yet be marked as dynamic. */
if (eh->dynindx == -1
&& !eh->forced_local
&& eh->type != STT_PARISC_MILLI)
{
if (! bfd_elf_link_record_dynamic_symbol (info, eh))
return FALSE;
}
if (!ensure_undef_weak_dynamic (info, eh))
return FALSE;
sec = htab->etab.sgot;
eh->got.offset = sec->size;
@ -2092,14 +2093,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf)
if (ELF_ST_VISIBILITY (eh->other) != STV_DEFAULT)
hh->dyn_relocs = NULL;
/* Make sure undefined weak symbols are output as a dynamic
symbol in PIEs. */
else if (eh->dynindx == -1
&& !eh->forced_local)
{
if (! bfd_elf_link_record_dynamic_symbol (info, eh))
return FALSE;
}
else if (!ensure_undef_weak_dynamic (info, eh))
return FALSE;
}
}
else
@ -2116,15 +2111,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf)
&& (eh->root.type == bfd_link_hash_undefweak
|| eh->root.type == bfd_link_hash_undefined))))
{
/* Make sure this symbol is output as a dynamic symbol.
Undefined weak syms won't yet be marked as dynamic. */
if (eh->dynindx == -1
&& !eh->forced_local
&& eh->type != STT_PARISC_MILLI)
{
if (! bfd_elf_link_record_dynamic_symbol (info, eh))
return FALSE;
}
if (!ensure_undef_weak_dynamic (info, eh))
return FALSE;
/* If that succeeded, we know we'll be keeping all the
relocs. */