* plugin.h (plugin_active_plugins_p): New prototype.

(is_ir_dummy_bfd): Delete prototype.
	* plugin.c: Fix formatting issues.
	(is_ir_dummy_bfd): Make static.
	(plugin_active_plugins_p): New function.
	* ldfile.c (ldfile_try_open_bfd): Use it to save work if no plugins
	are loaded.  Always close file descriptor after claim handler returns.
	* ldmain.c (add_archive_element): Likewise.
This commit is contained in:
Dave Korn
2010-11-05 07:20:07 +00:00
parent f4eaaf7fce
commit d44ad554d4
5 changed files with 42 additions and 15 deletions

View File

@@ -809,7 +809,7 @@ add_archive_element (struct bfd_link_info *info,
BFD, but we still want to output the original BFD filename. */
orig_input = *input;
#ifdef ENABLE_PLUGINS
if (bfd_my_archive (abfd) != NULL)
if (bfd_my_archive (abfd) != NULL && plugin_active_plugins_p ())
{
/* We must offer this archive member to the plugins to claim. */
int fd = open (bfd_my_archive (abfd)->filename, O_RDONLY | O_BINARY);
@@ -831,6 +831,8 @@ add_archive_element (struct bfd_link_info *info,
if (plugin_call_claim_file (&file, &claimed))
einfo (_("%P%F: %s: plugin reported error claiming file\n"),
plugin_error_plugin ());
/* fd belongs to us, not the plugin; but we don't need it. */
close (fd);
if (claimed)
{
/* Substitute the dummy BFD. */
@@ -843,7 +845,6 @@ add_archive_element (struct bfd_link_info *info,
{
/* Abandon the dummy BFD. */
bfd_close_all_done (file.handle);
close (fd);
input->claimed = FALSE;
}
}