yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix thinko in the code to check coff archive elements.

Browse Source 
* cofflink.c (coff_link_check_archive_element): Move the check for
	coff type input to the start of the function.
This commit is contained in:
Nick Clifton 2020-09-09 15:00:55 +01:00
parent 15a32af52f
commit 10556cdc8e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2020-09-09 Nick Clifton <nickc@redhat.com>
* cofflink.c (coff_link_check_archive_element): Move the check for
coff type input to the start of the function.
2020-09-09 Alan Modra <amodra@gmail.com>
* libbfd-in.h (_bfd_write_unsigned_leb128): Declare.

8
bfd/cofflink.c
View File

@ -206,6 +206,10 @@ coff_link_check_archive_element (bfd *abfd,
{
*pneeded = FALSE;
/* PR 22369 - Skip non COFF objects in the archive. */
if (! bfd_family_coff (abfd))
return TRUE;
/* We are only interested in symbols that are currently undefined.
If a symbol is currently known to be common, COFF linkers do not
bring in an object file which defines it. */
@ -218,10 +222,6 @@ coff_link_check_archive_element (bfd *abfd,
if (((struct coff_link_hash_entry *) h)->indx == -3)
return TRUE;
/* PR 22369 - Skip non COFF objects in the archive. */
if (! bfd_family_coff (abfd))
return TRUE;
/* Include this element? */
if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd))
return TRUE;