From fc579192b43d249de3661894c154342a6c7ebad2 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 28 May 2009 11:30:49 +0000
Subject: 2009-05-28 Nick Clifton <nickc@redhat.com>
* targets.c (_bfd_target_vector): Only include plugin target in
all-targets build if BFD_SUPPORTS_PLUGINS is non-zero.
2009-05-27 Rafael Avila de Espindola <espindola@google.com>
* plugin.c (program_name): Remove.
(plugin_program_name): New.
(bfd_plugin_set_program_name): New.
(try_load_plugin): Use plugin_program_name.
* plugin.h (bfd_plugin_set_program_name): New.
2009-05-27 Rafael Avila de Espindola <espindola@google.com>
* ar.c (main): Call bfd_plugin_set_program_name.
* nm.c (main): Call bfd_plugin_set_program_name.
---
bfd/plugin.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'bfd/plugin.c')
diff --git a/bfd/plugin.c b/bfd/plugin.c
index 49395e8cb7c..ca47ab620f2 100644
--- a/bfd/plugin.c
+++ b/bfd/plugin.c
@@ -106,7 +106,13 @@ add_symbols (void * handle,
return LDPS_OK;
}
-extern char *program_name __attribute__ ((weak));
+static const char *plugin_program_name;
+
+void
+bfd_plugin_set_program_name (const char *program_name)
+{
+ plugin_program_name = program_name;
+}
static int
try_load_plugin (const char *pname)
@@ -180,11 +186,11 @@ load_plugin (void)
if (plugin_name)
return try_load_plugin (plugin_name);
- if (!program_name)
+ if (plugin_program_name == NULL)
return 0;
plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
- p = make_relative_prefix (program_name,
+ p = make_relative_prefix (plugin_program_name,
BINDIR,
plugin_dir);
free (plugin_dir);
--
cgit v1.2.1