get_symbols(const void *handle, int nsyms, struct ld_plugin_symbol *syms);
static enum ld_plugin_status
-add_input_file(char *pathname);
+add_input_file(const char *pathname);
static enum ld_plugin_status
-add_input_library(char *pathname);
+add_input_library(const char *pathname);
+
+static enum ld_plugin_status
+set_extra_library_path(const char *path);
static enum ld_plugin_status
message(int level, const char *format, ...);
this->handle_ = dlopen(this->filename_.c_str(), RTLD_NOW);
if (this->handle_ == NULL)
{
- gold_error(_("%s: could not load plugin library"),
- this->filename_.c_str());
+ gold_error(_("%s: could not load plugin library: %s"),
+ this->filename_.c_str(), dlerror());
return;
}
sscanf(ver, "%d.%d", &major, &minor);
// Allocate and populate a transfer vector.
- const int tv_fixed_size = 15;
+ const int tv_fixed_size = 16;
int tv_size = this->args_.size() + tv_fixed_size;
- ld_plugin_tv *tv = new ld_plugin_tv[tv_size];
+ ld_plugin_tv* tv = new ld_plugin_tv[tv_size];
// Put LDPT_MESSAGE at the front of the list so the plugin can use it
// while processing subsequent entries.
tv[i].tv_tag = LDPT_ADD_INPUT_LIBRARY;
tv[i].tv_u.tv_add_input_library = add_input_library;
+ ++i;
+ tv[i].tv_tag = LDPT_SET_EXTRA_LIBRARY_PATH;
+ tv[i].tv_u.tv_set_extra_library_path = set_extra_library_path;
+
++i;
tv[i].tv_tag = LDPT_NULL;
tv[i].tv_u.tv_val = 0;
// Call the plugin claim-file handler.
inline bool
-Plugin::claim_file(struct ld_plugin_input_file *plugin_input_file)
+Plugin::claim_file(struct ld_plugin_input_file* plugin_input_file)
{
int claimed = 0;
ld_plugin_status
Plugin_manager::get_input_file(unsigned int handle,
- struct ld_plugin_input_file *file)
+ struct ld_plugin_input_file* file)
{
Pluginobj* obj = this->object(handle);
if (obj == NULL)
return LDPS_OK;
}
+// Add a new library path.
+
+ld_plugin_status
+Plugin_manager::set_extra_library_path(const char* path)
+{
+ this->extra_search_path_ = std::string(path);
+ return LDPS_OK;
+}
+
// Add a new input file.
ld_plugin_status
-Plugin_manager::add_input_file(char *pathname, bool is_lib)
+Plugin_manager::add_input_file(const char* pathname, bool is_lib)
{
Input_file_argument file(pathname,
(is_lib
? Input_file_argument::INPUT_FILE_TYPE_LIBRARY
: Input_file_argument::INPUT_FILE_TYPE_FILE),
- "", false, this->options_);
+ (is_lib
+ ? this->extra_search_path_.c_str()
+ : ""),
+ false,
+ this->options_);
Input_argument* input_argument = new Input_argument(file);
Task_token* next_blocker = new Task_token(true);
next_blocker->add_blocker();
- if (this->layout_->incremental_inputs())
+ if (parameters->options().incremental())
gold_error(_("input files added by plug-ins in --incremental mode not "
"supported yet"));
this->workqueue_->queue_soon(new Read_symbols(this->input_objects_,
{
// We never decided to include this object. We mark all symbols as
// preempted.
- gold_assert (this->symbols_.size() == 0);
+ gold_assert(this->symbols_.size() == 0);
for (int i = 0; i < nsyms; i++)
syms[i].resolution = LDPR_PREEMPTED_REG;
return LDPS_OK;
for (int i = 0; i < this->nsyms_; ++i)
{
- const struct ld_plugin_symbol *isym = &this->syms_[i];
+ const struct ld_plugin_symbol* isym = &this->syms_[i];
const char* name = isym->name;
const char* ver = isym->version;
elfcpp::Elf_Half shndx;
template<int size, bool big_endian>
Archive::Should_include
Sized_pluginobj<size, big_endian>::do_should_include_member(
- Symbol_table* symtab, Read_symbols_data*, std::string* why)
+ Symbol_table* symtab,
+ Layout* layout,
+ Read_symbols_data*,
+ std::string* why)
{
char* tmpbuf = NULL;
size_t tmpbuflen = 0;
- for (int i = 0; i < this->nsyms_; ++i) {
- const struct ld_plugin_symbol& sym = this->syms_[i];
- const char* name = sym.name;
- Symbol* symbol;
- Archive::Should_include t = Archive::should_include_member(symtab, name,
- &symbol, why,
- &tmpbuf,
- &tmpbuflen);
+ for (int i = 0; i < this->nsyms_; ++i)
+ {
+ const struct ld_plugin_symbol& sym = this->syms_[i];
+ const char* name = sym.name;
+ Symbol* symbol;
+ Archive::Should_include t = Archive::should_include_member(symtab,
+ layout,
+ name,
+ &symbol, why,
+ &tmpbuf,
+ &tmpbuflen);
if (t == Archive::SHOULD_INCLUDE_YES)
{
if (tmpbuf != NULL)
free(tmpbuf);
return t;
}
- }
+ }
if (tmpbuf != NULL)
free(tmpbuf);
return Archive::SHOULD_INCLUDE_UNKNOWN;
}
// Class Plugin_finish. This task runs after all replacement files have
-// been added. It calls each plugin's cleanup handler.
+// been added. For now, it's a placeholder for a possible plugin API
+// to allow the plugin to release most of its resources. The cleanup
+// handlers must be called later, because they can remove the temporary
+// object files that are needed until the end of the link.
class Plugin_finish : public Task
{
void
run(Workqueue*)
{
- Plugin_manager* plugins = parameters->options().plugins();
- gold_assert(plugins != NULL);
- plugins->cleanup();
+ // We could call early cleanup handlers here.
}
std::string
Plugin_hook::run(Workqueue* workqueue)
{
gold_assert(this->options_.has_plugins());
+ Symbol* start_sym;
+ if (parameters->options().entry())
+ start_sym = this->symtab_->lookup(parameters->options().entry());
+ else
+ start_sym = this->symtab_->lookup("_start");
+ if (start_sym != NULL)
+ start_sym->set_in_real_elf();
+
this->options_.plugins()->all_symbols_read(workqueue,
this,
this->input_objects_,
// Add symbols from a plugin-claimed input file.
static enum ld_plugin_status
-add_symbols(void* handle, int nsyms, const ld_plugin_symbol *syms)
+add_symbols(void* handle, int nsyms, const ld_plugin_symbol* syms)
{
gold_assert(parameters->options().has_plugins());
Pluginobj* obj = parameters->options().plugins()->make_plugin_object(
// file descriptor.
static enum ld_plugin_status
-get_input_file(const void *handle, struct ld_plugin_input_file *file)
+get_input_file(const void* handle, struct ld_plugin_input_file* file)
{
gold_assert(parameters->options().has_plugins());
unsigned int obj_index =
// Release the input file.
static enum ld_plugin_status
-release_input_file(const void *handle)
+release_input_file(const void* handle)
{
gold_assert(parameters->options().has_plugins());
unsigned int obj_index =
// Get the symbol resolution info for a plugin-claimed input file.
static enum ld_plugin_status
-get_symbols(const void * handle, int nsyms, ld_plugin_symbol* syms)
+get_symbols(const void* handle, int nsyms, ld_plugin_symbol* syms)
{
gold_assert(parameters->options().has_plugins());
Pluginobj* obj = parameters->options().plugins()->object(
// Add a new (real) input file generated by a plugin.
static enum ld_plugin_status
-add_input_file(char *pathname)
+add_input_file(const char* pathname)
{
gold_assert(parameters->options().has_plugins());
return parameters->options().plugins()->add_input_file(pathname, false);
// Add a new (real) library required by a plugin.
static enum ld_plugin_status
-add_input_library(char *pathname)
+add_input_library(const char* pathname)
{
gold_assert(parameters->options().has_plugins());
return parameters->options().plugins()->add_input_file(pathname, true);
}
+// Set the extra library path to be used by libraries added via
+// add_input_library
+
+static enum ld_plugin_status
+set_extra_library_path(const char* path)
+{
+ gold_assert(parameters->options().has_plugins());
+ return parameters->options().plugins()->set_extra_library_path(path);
+}
+
// Issue a diagnostic message from a plugin.
static enum ld_plugin_status
-message(int level, const char * format, ...)
+message(int level, const char* format, ...)
{
va_list args;
va_start(args, format);