Remove ref_dynamic_nonweak added by accident

bfd/

2012-11-20  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/14862
	* elf-bfd.h (elf_link_hash_entry): Remove ref_dynamic_nonweak
	added by accident.
	(elf_link_add_object_symbols): Don't set nor check
	ref_dynamic_nonweak.

ld/testsuite/

2012-11-20  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/14862
	* ld-elf/shared.exp (build_tests): Build libpr14862-1.o and
	libpr14862.so.
	(run_tests): Test pr14862.

	* ld-elf/pr14862-1.c: New file.
	* ld-elf/pr14862-2.c: Likewise.
	* ld-elf/pr14862.map: Likewise.
	* ld-elf/pr14862.out: Likewise.
This commit is contained in:
H.J. Lu 2012-11-20 22:17:27 +00:00
parent b039ef0457
commit dda8ddc56f
9 changed files with 52 additions and 9 deletions

View file

@ -4394,8 +4394,6 @@ error_free_dyn:
{
h->def_dynamic = 0;
h->ref_dynamic = 1;
/* PR 12549: Note if the dynamic reference is weak. */
h->ref_dynamic_nonweak = (bind != STB_WEAK);
}
}
@ -4413,9 +4411,6 @@ error_free_dyn:
{
h->ref_dynamic = 1;
hi->ref_dynamic = 1;
/* PR 12549: Note if the dynamic reference is weak. */
hi->ref_dynamic_nonweak =
h->ref_dynamic_nonweak = (bind != STB_WEAK);
}
else
{
@ -4503,8 +4498,8 @@ error_free_dyn:
if (!add_needed
&& definition
&& ((dynsym
&& h->ref_regular_nonweak)
|| (h->ref_dynamic_nonweak
&& h->ref_regular)
|| (h->ref_dynamic
&& (elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0
&& !on_needed_list (elf_dt_name (abfd), htab->needed))))
{