This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 8/8] PR ld/17878: Use bfd_maybe_object_p in coff-rs6000.c
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: binutils at sourceware dot org
- Date: Thu, 5 Feb 2015 05:57:26 -0800
- Subject: [PATCH 8/8] PR ld/17878: Use bfd_maybe_object_p in coff-rs6000.c
- Authentication-results: sourceware.org; auth=none
PR ld/17878
* coff-rs6000.c (member_layout_init): Replace bfd_check_format
with bfd_maybe_object_p.
(xcoff_write_archive_contents_big): Likewise.
---
bfd/coff-rs6000.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
index 8fbfa16..a52b57f 100644
--- a/bfd/coff-rs6000.c
+++ b/bfd/coff-rs6000.c
@@ -273,7 +273,7 @@ member_layout_init (struct member_layout *info, bfd *archive,
info->contents_size = arelt_size (member);
info->trailing_padding = info->contents_size & 1;
- if (bfd_check_format (member, bfd_object)
+ if (bfd_maybe_object_p (member, plugin_active_p (member))
&& bfd_get_flavour (member) == bfd_target_xcoff_flavour
&& (member->flags & DYNAMIC) != 0)
info->leading_padding
@@ -2146,7 +2146,8 @@ xcoff_write_archive_contents_old (bfd *abfd)
if (makemap && ! hasobjects)
{
- if (bfd_check_format (iterator.current.member, bfd_object))
+ if (bfd_maybe_object_p (iterator.current.member,
+ plugin_active_p (iterator.current.member)))
hasobjects = TRUE;
}
@@ -2308,7 +2309,8 @@ xcoff_write_archive_contents_big (bfd *abfd)
if (makemap
&& ! hasobjects
- && bfd_check_format (current_bfd, bfd_object))
+ && bfd_maybe_object_p (current_bfd,
+ plugin_active_p (current_bfd)))
hasobjects = TRUE;
if (current_bfd->arelt_data == NULL)
--
2.1.0