(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.
+2010-11-05 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ * 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.
+
2010-11-05 Alan Modra <amodra@gmail.com>
* ldlang.c (lang_add_section): Distinguish ELF treatment of NOLOAD.
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))
+ if (bfd_check_format (entry->the_bfd, bfd_object)
+ && plugin_active_plugins_p ())
{
int fd = open (attempt, O_RDONLY | O_BINARY);
if (fd >= 0)
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)
{
/* Discard the real file's BFD and substitute the dummy one. */
}
else
{
- /* If plugin didn't claim the file, we don't need the fd or the
- dummy bfd. Can't avoid speculatively creating it, alas. */
+ /* If plugin didn't claim the file, we don't need the dummy
+ bfd. Can't avoid speculatively creating it, alas. */
bfd_close_all_done (file.handle);
- close (fd);
entry->claimed = FALSE;
}
}
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);
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. */
{
/* Abandon the dummy BFD. */
bfd_close_all_done (file.handle);
- close (fd);
input->claimed = FALSE;
}
}
}
/* Return name of plugin which caused an error if any. */
-const char *plugin_error_plugin (void)
+const char *
+plugin_error_plugin (void)
{
return error_plugin ? error_plugin : _("<no plugin>");
}
/* Handle -plugin arg: find and load plugin, or return error. */
-int plugin_opt_plugin (const char *plugin)
+int
+plugin_opt_plugin (const char *plugin)
{
plugin_t *newplug;
/* Accumulate option arguments for last-loaded plugin, or return
error if none. */
-int plugin_opt_plugin_arg (const char *arg)
+int
+plugin_opt_plugin_arg (const char *arg)
{
plugin_arg_t *newarg;
return abfd;
}
-/* Check if the BFD is an IR dummy. */
-bfd_boolean
+/* Check if the BFD passed in is an IR dummy object file. */
+static bfd_boolean
is_ir_dummy_bfd (const bfd *abfd)
{
size_t namlen;
tv->tv_u.tv_val = 0;
}
+/* Return true if any plugins are active this run. Only valid
+ after options have been processed. */
+bfd_boolean
+plugin_active_plugins_p (void)
+{
+ return plugins_list != NULL;
+}
+
/* Load up and initialise all plugins after argument parsing. */
-int plugin_load_plugins (void)
+int
+plugin_load_plugins (void)
{
struct ld_plugin_tv *my_tv;
unsigned int max_args = 0;
error if none. */
extern int plugin_opt_plugin_arg (const char *arg);
+/* Return true if any plugins are active this run. Only valid
+ after options have been processed. */
+extern bfd_boolean plugin_active_plugins_p (void);
+
/* Load up and initialise all plugins after argument parsing. */
extern int plugin_load_plugins (void);
add_symbols hook has been called so that it can be read when linking. */
extern bfd *plugin_get_ir_dummy_bfd (const char *name, bfd *template);
-/* Check if the BFD passed in is an IR dummy object file. */
-extern bfd_boolean is_ir_dummy_bfd (const bfd *abfd);
-
/* Notice-symbol bfd linker callback hook. */
extern bfd_boolean plugin_notice (struct bfd_link_info *info,
const char *name, bfd *abfd, asection *section,