OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check the DYNAMIC bit for input shared objects 

Since the BFD section count may not be cleared for shared objects during
linking, we should check the DYNAMIC bit for input shared objects.

bfd/

	PR ld/21626
	* elf-properties.c (_bfd_elf_link_setup_gnu_properties): Check
	the DYNAMIC bit instead of bfd_count_sections.

ld/

	PR ld/21626
	* testsuite/ld-i386/i386.exp: Run ld/21626 tests.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
This commit is contained in:
H.J. Lu 2017-06-19 20:30:20 -07:00
parent a6cab9afd2
commit abfa390dac
5 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2017-06-19 H.J. Lu <hongjiu.lu@intel.com>
PR ld/21626
* elf-properties.c (_bfd_elf_link_setup_gnu_properties): Check
the DYNAMIC bit instead of bfd_count_sections.
2017-06-19 Nick Clifton <nickc@redhat.com>
PR binutils/21618

4
bfd/elf-properties.c
View File

@ -318,7 +318,7 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
/* Find the first relocatable ELF input with GNU properties. */
for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link.next)
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
&& bfd_count_sections (abfd) != 0
&& (abfd->flags & DYNAMIC) == 0
&& elf_properties (abfd) != NULL)
{
has_properties = TRUE;
@ -342,7 +342,7 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
/* Merge .note.gnu.property sections. */
for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link.next)
if (abfd != first_pbfd && bfd_count_sections (abfd) != 0)
if (abfd != first_pbfd && (abfd->flags & DYNAMIC) == 0)
{
elf_property_list *null_ptr = NULL;
elf_property_list **listp = &null_ptr;

6
ld/ChangeLog
View File

@ -1,3 +1,9 @@
2017-06-19 H.J. Lu <hongjiu.lu@intel.com>
PR ld/21626
* testsuite/ld-i386/i386.exp: Run ld/21626 tests.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
2017-06-18 Alan Modra <amodra@gmail.com>
* testsuite/lib/ld-lib.exp (is_underscore_target): New.

18
ld/testsuite/ld-i386/i386.exp
View File

@ -1182,6 +1182,24 @@ run_ld_link_tests [list \
{{objdump -dwr plt-pic2.dd}} \
"plt-pic2.so" \
] \
[list \
"Build pr21626.so" \
"-shared -melf_i386" \
"" \
"--32" \
{property-x86-3.s} \
"" \
"pr21626.so" \
] \
[list \
"Build pr21626" \
"-melf_i386 tmpdir/pr21626.so" \
"" \
"--32" \
{start.s foo.s} \
"" \
"pr21626" \
] \
]
# Linux only tests

18
ld/testsuite/ld-x86-64/x86-64.exp
View File

@ -1368,6 +1368,24 @@ run_ld_link_tests [list \
{{readelf -SW plt2.rd} {objdump -dwr plt2.dd}} \
"plt2" \
] \
[list \
"Build pr21626.so" \
"-shared -melf_x86_64" \
"" \
"--64 -defsym __64_bit__=1" \
{property-x86-3.s} \
"" \
"pr21626.so" \
] \
[list \
"Build pr21626" \
"-melf_x86_64 tmpdir/pr21626.so" \
"" \
"--64" \
{start.s foo.s} \
"" \
"pr21626" \
] \
]
# Linux only tests