From: H.J. Lu <hjl.tools@gmail.com>
Date: Sun, 8 Feb 2015 16:45:23 +0000 (-0800)
Subject: Check format against bfd_object directly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e13419c472637ebc6ad1554bdc6d50f2bd793574;p=binutils-gdb.git

Check format against bfd_object directly

There is no need to call bfd_check_format.  We should just check format
against bfd_object directly.

	* plugin.c (plugin_maybe_claim): Check format against bfd_object
	directly.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 00c9466a245..856249b1676 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* plugin.c (plugin_maybe_claim): Check format against bfd_object
+	directly.
+
 2015-02-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* plugin.c (plugin_maybe_claim): Replace entry->the_bfd with
diff --git a/ld/plugin.c b/ld/plugin.c
index c4116fb54b2..5b8a7cfa117 100644
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -1061,7 +1061,7 @@ plugin_maybe_claim (lang_input_statement_type *entry)
     einfo (_("%P%F: %s: plugin reported error claiming file\n"),
 	   plugin_error_plugin ());
 
-  if (input->fd != -1 && bfd_check_format (ibfd, bfd_object))
+  if (input->fd != -1 && ibfd->format == bfd_object)
     {
       /* FIXME: fd belongs to us, not the plugin.  IR for GCC plugin,
 	 which doesn't need fd after plugin_call_claim_file, is