From: H.J. Lu Date: Sun, 8 Feb 2015 23:00:34 +0000 (-0800) Subject: Don't bfd_check_format if not needed X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1d5b29cfe459ceb6d0965ca3ab8936e0d72e1fd5;p=binutils-gdb.git Don't bfd_check_format if not needed When plugin isn't active or there is no thing more to claim, we don't need to call bfd_check_format. * 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. --- diff --git a/ld/ChangeLog b/ld/ChangeLog index 856249b1676..bf59ab3e176 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2015-02-08 H.J. Lu + + * 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 * plugin.c (plugin_maybe_claim): Check format against bfd_object diff --git a/ld/ldfile.c b/ld/ldfile.c index 05889f2e6c1..e19f55e6e04 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 */