diff options
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/ldfile.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 856249b..bf59ab3 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2015-02-08 H.J. Lu <hongjiu.lu@intel.com> + * ldfile.c (ldfile_try_open_bfd): Don't call bfd_check_format + if plugin isn't active or there is no thing more to claim. + +2015-02-08 H.J. Lu <hongjiu.lu@intel.com> + * plugin.c (plugin_maybe_claim): Check format against bfd_object directly. diff --git a/ld/ldfile.c b/ld/ldfile.c index 05889f2..e19f55e 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -301,9 +301,9 @@ success: bfd_object that it sets the bfd's arch and mach, which will be needed when and if we want to bfd_create a new one using this one as a template. */ - if (bfd_check_format (entry->the_bfd, bfd_object) - && link_info.lto_plugin_active - && !no_more_claiming) + if (link_info.lto_plugin_active + && !no_more_claiming + && bfd_check_format (entry->the_bfd, bfd_object)) plugin_maybe_claim (entry); #endif /* ENABLE_PLUGINS */ |