This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[committed, PATCH] Remove plugin_active_plugins_p()
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sourceware dot org
- Date: Thu, 29 Jan 2015 04:59:10 -0800
- Subject: [committed, PATCH] Remove plugin_active_plugins_p()
- Authentication-results: sourceware.org; auth=none
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
There is no need for plugin_active_plugins_p() when we have
link_info.lto_plugin_active. I checked in this patch to
replace plugin_active_plugins_p() with link_info.lto_plugin_active.
H.J.
* ldfile.c (ldfile_try_open_bfd): Replace plugin_active_plugins_p()
with link_info.lto_plugin_active.
* ldlang.c (lang_process): Likewise.
* ldmain.c (add_archive_element): Likewise.
* plugin.c (plugin_active_plugins_p): Removed.
* plugin.h (plugin_active_plugins_p): Likewise.
---
ld/ChangeLog | 9 +++++++++
ld/ldfile.c | 2 +-
ld/ldlang.c | 2 +-
ld/ldmain.c | 2 +-
ld/plugin.c | 8 --------
ld/plugin.h | 4 ----
6 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index c20211b..c889769 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-29 H.J. Lu <hongjiu.lu@intel.com>
+
+ * ldfile.c (ldfile_try_open_bfd): Replace plugin_active_plugins_p()
+ with link_info.lto_plugin_active.
+ * ldlang.c (lang_process): Likewise.
+ * ldmain.c (add_archive_element): Likewise.
+ * plugin.c (plugin_active_plugins_p): Removed.
+ * plugin.h (plugin_active_plugins_p): Likewise.
+
2015-01-28 H.J. Lu <hongjiu.lu@intel.com>
* plugin.h (plugin_get_ir_dummy_bfd): Removed. Move comments to
diff --git a/ld/ldfile.c b/ld/ldfile.c
index f33bc9d..c9c9541 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -302,7 +302,7 @@ success:
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)
- && plugin_active_plugins_p ()
+ && link_info.lto_plugin_active
&& !no_more_claiming)
{
int fd = open (attempt, O_RDONLY | O_BINARY);
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 3a4257c..5c4581f 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -6624,7 +6624,7 @@ lang_process (void)
open_input_bfds (statement_list.head, OPEN_BFD_NORMAL);
#ifdef ENABLE_PLUGINS
- if (plugin_active_plugins_p ())
+ if (link_info.lto_plugin_active)
{
lang_statement_list_type added;
lang_statement_list_type files, inputfiles;
diff --git a/ld/ldmain.c b/ld/ldmain.c
index a6207c6..86f02a6 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -790,7 +790,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 (plugin_active_plugins_p () && !no_more_claiming)
+ if (link_info.lto_plugin_active && !no_more_claiming)
{
/* We must offer this archive member to the plugins to claim. */
const char *filename = (bfd_my_archive (abfd) != NULL
diff --git a/ld/plugin.c b/ld/plugin.c
index 2b79e1a..cfbca0b 100644
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -791,14 +791,6 @@ set_tv_plugin_args (plugin_t *plugin, struct ld_plugin_tv *tv)
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. */
void
plugin_load_plugins (void)
diff --git a/ld/plugin.h b/ld/plugin.h
index c5435ff..15532cd 100644
--- a/ld/plugin.h
+++ b/ld/plugin.h
@@ -39,10 +39,6 @@ extern void plugin_opt_plugin (const char *plugin);
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 void plugin_load_plugins (void);
--
1.9.3