FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove ref_dynamic_nonweak added by accident

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
bfd/ChangeLog
View file

@ -1,3 +1,11 @@
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.
2012-11-20 Alan Modra <amodra@gmail.com>
* elf32-rx.c (rx_elf_print_private_bfd_data): Warning fix.

2
bfd/elf-bfd.h
View file

@ -168,8 +168,6 @@ struct elf_link_hash_entry
/* Symbol has a non-weak reference from a non-shared object (other than
the object in which it is defined). */
unsigned int ref_regular_nonweak : 1;
/* Symbol has a non-weak reference from a shared object. */
unsigned int ref_dynamic_nonweak : 1;
/* Dynamic symbol has been adjustd. */
unsigned int dynamic_adjusted : 1;
/* Symbol needs a copy reloc. */

9
bfd/elflink.c
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))))
{

12
ld/testsuite/ChangeLog
View file

@ -1,3 +1,15 @@
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.
2012-11-20 H.J. Lu <hongjiu.lu@intel.com>
* ld-elf/global1.d: New file.

9
ld/testsuite/ld-elf/pr14862-1.c Normal file
View file

@ -0,0 +1,9 @@
extern void bar () __attribute__((weak));
int
main (void)
{
if (bar)
bar ();
return 0;
}

7
ld/testsuite/ld-elf/pr14862-2.c Normal file
View file

@ -0,0 +1,7 @@
#include <stdio.h>
void
bar (void)
{
printf ("OK\n");
}

4
ld/testsuite/ld-elf/pr14862.map Normal file
View file

@ -0,0 +1,4 @@
VERS_1 {
global: bar;
local: *;
};

1
ld/testsuite/ld-elf/pr14862.out Normal file
View file

@ -0,0 +1 @@
OK

9
ld/testsuite/ld-elf/shared.exp
View file

@ -173,6 +173,12 @@ set build_tests {
{"Build libpr14323-2.so"
"-shared" "-fPIC"
{pr14323-2.c} {} "libpr14323-2.so"}
{"Build pr14862-1.o"
"-r -nostdlib" ""
{pr14862-1.c} {} "libpr14862-1.o"}
{"Build libpr14862.so"
"-shared -Wl,--version-script=pr11138-1.map" "-fPIC"
{pr14862-2.c} {} "libpr14862.so"}
}
run_cc_link_tests $build_tests
@ -308,6 +314,9 @@ set run_tests {
{"Run with pr14323-1.c pr14323-2.so"
"tmpdir/libpr14323-2.so" ""
{pr14323-1.c} "pr14323" "pass.out"}
{"Run with pr14862-1.c libpr14862.so"
"--as-needed tmpdir/libpr14862-1.o tmpdir/libpr14862.so" ""
{dummy.c} "pr14862" "pr14862.out"}
}
# NetBSD ELF systems do not currently support the .*_array sections.