Simplify is_ir_dummy_bfd test

is_ir_dummy_bfd started life before BFD_PLUGIN was invented.

	* plugin.c (is_ir_dummy_bfd): Test BFD_PLUGIN flag rather than
	flags.claimed.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index fa7cab611c00ba00adb7df470a8037c405deed37..791bc749322479481aaab20829ecc97ec0b7701c 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-14  Alan Modra  <amodra@gmail.com>
+
+       * plugin.c (is_ir_dummy_bfd): Test BFD_PLUGIN flag rather than
+       flags.claimed.
+
 2014-08-13  Yaakov Selkowitz  <yselkowi@redhat.com>
 
        * pe-dll.c (autofilter_entry_type autofilter_symbollist_i386): Add

diff --git a/ld/plugin.c b/ld/plugin.c
index 652cde15732501ce078786c8758e2616cf053dc5..f02a97f0c32796130a1fec6e3deb29c2758c7fca 100644 (file)
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -271,17 +271,12 @@ plugin_get_ir_dummy_bfd (const char *name, bfd *srctemplate)
 }
 
 /* Check if the BFD passed in is an IR dummy object file.  */
-static bfd_boolean
+static inline bfd_boolean
 is_ir_dummy_bfd (const bfd *abfd)
 {
   /* ABFD can sometimes legitimately be NULL, e.g. when called from one
-     of the linker callbacks for a symbol in the *ABS* or *UND* sections.
-     Likewise, the usrdata field may be NULL if ABFD was added by the
-     backend without a corresponding input statement, as happens e.g.
-     when processing DT_NEEDED dependencies.  */
-  return (abfd
-         && abfd->usrdata
-         && ((lang_input_statement_type *)(abfd->usrdata))->flags.claimed);
+     of the linker callbacks for a symbol in the *ABS* or *UND* sections.  */
+  return abfd != NULL && (abfd->flags & BFD_PLUGIN) != 0;
 }
 
 /* Helpers to convert between BFD and GOLD symbol formats.  */