X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Fplugin.cc;h=0bb277e126d3b4829110b6ce70528bdde8f1b815;hb=7d7167ce1b93f8bb151daa2572314987eaeb9e3c;hp=7e259e0803345875e9a1938e5b31560db876e1b7;hpb=9c793f143cd36b86c60929319fc0551948dc238d;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/plugin.cc b/gold/plugin.cc index 7e259e0803..0bb277e126 100644 --- a/gold/plugin.cc +++ b/gold/plugin.cc @@ -1,6 +1,6 @@ // plugin.cc -- plugin manager for gold -*- C++ -*- -// Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +// Copyright (C) 2008-2019 Free Software Foundation, Inc. // Written by Cary Coutant . // This file is part of gold. @@ -22,17 +22,52 @@ #include "gold.h" +#include #include #include #include #include #include +#include +#include +#include "libiberty.h" #ifdef ENABLE_PLUGINS +#ifdef HAVE_DLFCN_H #include +#elif defined (HAVE_WINDOWS_H) +#include +#else +#error Unknown how to handle dynamic-load-libraries. #endif +#if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H) + +#define RTLD_NOW 0 /* Dummy value. */ +static void * +dlopen(const char *file, int mode ATTRIBUTE_UNUSED) +{ + return LoadLibrary(file); +} + +static void * +dlsym(void *handle, const char *name) +{ + return reinterpret_cast( + GetProcAddress(static_cast(handle),name)); +} + +static const char * +dlerror(void) +{ + return "unable to load dll"; +} + +#endif /* !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H) */ +#endif /* ENABLE_PLUGINS */ + #include "parameters.h" +#include "debug.h" #include "errors.h" #include "fileread.h" #include "layout.h" @@ -41,6 +76,7 @@ #include "target.h" #include "readsyms.h" #include "symtab.h" +#include "descriptors.h" #include "elfcpp.h" namespace gold @@ -77,6 +113,12 @@ release_input_file(const void *handle); static enum ld_plugin_status get_symbols(const void *handle, int nsyms, struct ld_plugin_symbol *syms); +static enum ld_plugin_status +get_symbols_v2(const void *handle, int nsyms, struct ld_plugin_symbol *syms); + +static enum ld_plugin_status +get_symbols_v3(const void *handle, int nsyms, struct ld_plugin_symbol *syms); + static enum ld_plugin_status add_input_file(const char *pathname); @@ -89,11 +131,59 @@ set_extra_library_path(const char *path); static enum ld_plugin_status message(int level, const char *format, ...); +static enum ld_plugin_status +get_input_section_count(const void* handle, unsigned int* count); + +static enum ld_plugin_status +get_input_section_type(const struct ld_plugin_section section, + unsigned int* type); + +static enum ld_plugin_status +get_input_section_name(const struct ld_plugin_section section, + char** section_name_ptr); + +static enum ld_plugin_status +get_input_section_contents(const struct ld_plugin_section section, + const unsigned char** section_contents, + size_t* len); + +static enum ld_plugin_status +update_section_order(const struct ld_plugin_section *section_list, + unsigned int num_sections); + +static enum ld_plugin_status +allow_section_ordering(); + +static enum ld_plugin_status +allow_unique_segment_for_sections(); + +static enum ld_plugin_status +unique_segment_for_sections(const char* segment_name, + uint64_t flags, + uint64_t align, + const struct ld_plugin_section *section_list, + unsigned int num_sections); + +static enum ld_plugin_status +get_input_section_alignment(const struct ld_plugin_section section, + unsigned int* addralign); + +static enum ld_plugin_status +get_input_section_size(const struct ld_plugin_section section, + uint64_t* secsize); + +static enum ld_plugin_status +register_new_input(ld_plugin_new_input_handler handler); + +static enum ld_plugin_status +get_wrap_symbols(uint64_t *num_symbols, const char ***wrap_symbol_list); + }; #endif // ENABLE_PLUGINS -static Pluginobj* make_sized_plugin_object(Input_file* input_file, +static Pluginobj* make_sized_plugin_object(const std::string& filename, + Input_file* input_file, off_t offset, off_t filesize); // Plugin methods. @@ -133,7 +223,8 @@ Plugin::load() sscanf(ver, "%d.%d", &major, &minor); // Allocate and populate a transfer vector. - const int tv_fixed_size = 17; + const int tv_fixed_size = 31; + int tv_size = this->args_.size() + tv_fixed_size; ld_plugin_tv* tv = new ld_plugin_tv[tv_size]; @@ -157,6 +248,8 @@ Plugin::load() tv[i].tv_u.tv_val = LDPO_REL; else if (parameters->options().shared()) tv[i].tv_u.tv_val = LDPO_DYN; + else if (parameters->options().pie()) + tv[i].tv_u.tv_val = LDPO_PIE; else tv[i].tv_u.tv_val = LDPO_EXEC; @@ -203,6 +296,14 @@ Plugin::load() tv[i].tv_tag = LDPT_GET_SYMBOLS; tv[i].tv_u.tv_get_symbols = get_symbols; + ++i; + tv[i].tv_tag = LDPT_GET_SYMBOLS_V2; + tv[i].tv_u.tv_get_symbols = get_symbols_v2; + + ++i; + tv[i].tv_tag = LDPT_GET_SYMBOLS_V3; + tv[i].tv_u.tv_get_symbols = get_symbols_v3; + ++i; tv[i].tv_tag = LDPT_ADD_INPUT_FILE; tv[i].tv_u.tv_add_input_file = add_input_file; @@ -215,6 +316,55 @@ Plugin::load() 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_GET_INPUT_SECTION_COUNT; + tv[i].tv_u.tv_get_input_section_count = get_input_section_count; + + ++i; + tv[i].tv_tag = LDPT_GET_INPUT_SECTION_TYPE; + tv[i].tv_u.tv_get_input_section_type = get_input_section_type; + + ++i; + tv[i].tv_tag = LDPT_GET_INPUT_SECTION_NAME; + tv[i].tv_u.tv_get_input_section_name = get_input_section_name; + + ++i; + tv[i].tv_tag = LDPT_GET_INPUT_SECTION_CONTENTS; + tv[i].tv_u.tv_get_input_section_contents = get_input_section_contents; + + ++i; + tv[i].tv_tag = LDPT_UPDATE_SECTION_ORDER; + tv[i].tv_u.tv_update_section_order = update_section_order; + + ++i; + tv[i].tv_tag = LDPT_ALLOW_SECTION_ORDERING; + tv[i].tv_u.tv_allow_section_ordering = allow_section_ordering; + + ++i; + tv[i].tv_tag = LDPT_ALLOW_UNIQUE_SEGMENT_FOR_SECTIONS; + tv[i].tv_u.tv_allow_unique_segment_for_sections + = allow_unique_segment_for_sections; + + ++i; + tv[i].tv_tag = LDPT_UNIQUE_SEGMENT_FOR_SECTIONS; + tv[i].tv_u.tv_unique_segment_for_sections = unique_segment_for_sections; + + ++i; + tv[i].tv_tag = LDPT_GET_INPUT_SECTION_ALIGNMENT; + tv[i].tv_u.tv_get_input_section_alignment = get_input_section_alignment; + + ++i; + tv[i].tv_tag = LDPT_GET_INPUT_SECTION_SIZE; + tv[i].tv_u.tv_get_input_section_size = get_input_section_size; + + ++i; + tv[i].tv_tag = LDPT_REGISTER_NEW_INPUT_HOOK; + tv[i].tv_u.tv_register_new_input = register_new_input; + + ++i; + tv[i].tv_tag = LDPT_GET_WRAP_SYMBOLS; + tv[i].tv_u.tv_get_wrap_symbols = get_wrap_symbols; + ++i; tv[i].tv_tag = LDPT_NULL; tv[i].tv_u.tv_val = 0; @@ -253,6 +403,15 @@ Plugin::all_symbols_read() (*this->all_symbols_read_handler_)(); } +// Call the new_input handler. + +inline void +Plugin::new_input(struct ld_plugin_input_file* plugin_input_file) +{ + if (this->new_input_handler_ != NULL) + (*this->new_input_handler_)(plugin_input_file); +} + // Call the cleanup handler. inline void @@ -307,6 +466,236 @@ class Plugin_rescan : public Task Task_token* next_blocker_; }; +// Plugin_recorder logs plugin actions and saves intermediate files +// for later replay. + +class Plugin_recorder +{ + public: + Plugin_recorder() : file_count_(0), tempdir_(NULL), logfile_(NULL) + { } + + bool + init(); + + void + claimed_file(const std::string& obj_name, off_t offset, off_t filesize, + const std::string& plugin_name); + + void + unclaimed_file(const std::string& obj_name, off_t offset, off_t filesize); + + void + replacement_file(const char* name, bool is_lib); + + void + record_symbols(const Object* obj, int nsyms, + const struct ld_plugin_symbol* syms); + + void + finish() + { ::fclose(this->logfile_); } + + private: + unsigned int file_count_; + const char* tempdir_; + FILE* logfile_; +}; + +bool +Plugin_recorder::init() +{ + // Create a temporary directory where we can stash the log and + // copies of replacement files. + char dir_template[] = "gold-recording-XXXXXX"; +#ifdef HAVE_MKDTEMP + if (mkdtemp(dir_template) == NULL) + return false; +#else + if (mktemp(dir_template) == NULL) + return false; +#if defined (_WIN32) && !defined (__CYGWIN32__) + if (mkdir(dir_template) != 0) + return false; +#else + if (mkdir(dir_template, 0700) != 0) + return false; +#endif +#endif + + size_t len = strlen(dir_template) + 1; + char* tempdir = new char[len]; + strncpy(tempdir, dir_template, len); + + // Create the log file. + std::string logname(tempdir); + logname.append("/log"); + FILE* logfile = ::fopen(logname.c_str(), "w"); + if (logfile == NULL) + return false; + + this->tempdir_ = tempdir; + this->logfile_ = logfile; + + gold_info(_("%s: recording to %s"), program_name, this->tempdir_); + + return true; +} + +void +Plugin_recorder::claimed_file(const std::string& obj_name, + off_t offset, + off_t filesize, + const std::string& plugin_name) +{ + fprintf(this->logfile_, "PLUGIN: %s\n", plugin_name.c_str()); + fprintf(this->logfile_, "CLAIMED: %s", obj_name.c_str()); + if (offset > 0) + fprintf(this->logfile_, " @%ld", static_cast(offset)); + fprintf(this->logfile_, " %ld\n", static_cast(filesize)); +} + +void +Plugin_recorder::unclaimed_file(const std::string& obj_name, + off_t offset, + off_t filesize) +{ + fprintf(this->logfile_, "UNCLAIMED: %s", obj_name.c_str()); + if (offset > 0) + fprintf(this->logfile_, " @%ld", static_cast(offset)); + fprintf(this->logfile_, " %ld\n", static_cast(filesize)); +} + +// Make a hard link to INNAME from OUTNAME, if possible. +// If not, copy the file. + +static bool +link_or_copy_file(const char* inname, const char* outname) +{ + static char buf[4096]; + +#ifdef HAVE_LINK + if (::link(inname, outname) == 0) + return true; +#endif + + int in = ::open(inname, O_RDONLY); + if (in < 0) + { + gold_warning(_("%s: can't open (%s)"), inname, strerror(errno)); + return false; + } + int out = ::open(outname, O_CREAT | O_TRUNC | O_WRONLY, 0600); + if (out < 0) + { + gold_warning(_("%s: can't create (%s)"), outname, strerror(errno)); + ::close(in); + return false; + } + ssize_t len; + while ((len = ::read(in, buf, sizeof(buf))) > 0) + { + if (::write(out, buf, len) != len) + { + gold_warning(_("%s: write error while making copy of file (%s)"), + inname, strerror(errno)); + break; + } + } + ::close(in); + ::close(out); + return true; +} + +void +Plugin_recorder::replacement_file(const char* name, bool is_lib) +{ + fprintf(this->logfile_, "REPLACEMENT: %s", name); + if (is_lib) + fprintf(this->logfile_, "(lib)"); + else + { + char counter[10]; + const char* basename = lbasename(name); + snprintf(counter, sizeof(counter), "%05d", this->file_count_); + ++this->file_count_; + std::string outname(this->tempdir_); + outname.append("/"); + outname.append(counter); + outname.append("-"); + outname.append(basename); + if (link_or_copy_file(name, outname.c_str())) + fprintf(this->logfile_, " -> %s", outname.c_str()); + } + fprintf(this->logfile_, "\n"); +} + +void +Plugin_recorder::record_symbols(const Object* obj, int nsyms, + const struct ld_plugin_symbol* syms) +{ + fprintf(this->logfile_, "SYMBOLS: %d %s\n", nsyms, obj->name().c_str()); + for (int i = 0; i < nsyms; ++i) + { + const struct ld_plugin_symbol* isym = &syms[i]; + + const char* def; + switch (isym->def) + { + case LDPK_DEF: + def = "D"; + break; + case LDPK_WEAKDEF: + def = "WD"; + break; + case LDPK_UNDEF: + def = "U"; + break; + case LDPK_WEAKUNDEF: + def = "WU"; + break; + case LDPK_COMMON: + def = "C"; + break; + default: + def = "?"; + break; + } + + char vis; + switch (isym->visibility) + { + case LDPV_PROTECTED: + vis = 'P'; + break; + case LDPV_INTERNAL: + vis = 'I'; + break; + case LDPV_HIDDEN: + vis = 'H'; + break; + case LDPV_DEFAULT: + vis = 'D'; + break; + default: + vis = '?'; + break; + } + + fprintf(this->logfile_, " %5d: %-2s %c %s", i, def, vis, isym->name); + if (isym->version != NULL && isym->version[0] != '\0') + fprintf(this->logfile_, "@%s", isym->version); + if (isym->comdat_key != NULL && isym->comdat_key[0] != '\0') + { + if (strcmp(isym->name, isym->comdat_key) == 0) + fprintf(this->logfile_, " [comdat]"); + else + fprintf(this->logfile_, " [comdat: %s]", isym->comdat_key); + } + fprintf(this->logfile_, "\n"); + } +} + // Plugin_manager methods. Plugin_manager::~Plugin_manager() @@ -321,13 +710,23 @@ Plugin_manager::~Plugin_manager() ++obj) delete *obj; this->objects_.clear(); + delete this->lock_; + delete this->recorder_; } // Load all plugin libraries. void -Plugin_manager::load_plugins() +Plugin_manager::load_plugins(Layout* layout) { + this->layout_ = layout; + + if (is_debugging_enabled(DEBUG_PLUGIN)) + { + this->recorder_ = new Plugin_recorder(); + this->recorder_->init(); + } + for (this->current_ = this->plugins_.begin(); this->current_ != this->plugins_.end(); ++this->current_) @@ -338,10 +737,12 @@ Plugin_manager::load_plugins() Pluginobj* Plugin_manager::claim_file(Input_file* input_file, off_t offset, - off_t filesize) + off_t filesize, Object* elf_object) { - if (this->in_replacement_phase_) - return NULL; + bool lock_initialized = this->initialize_lock_.initialize(); + + gold_assert(lock_initialized); + Hold_lock hl(*this->lock_); unsigned int handle = this->objects_.size(); this->input_file_ = input_file; @@ -350,25 +751,54 @@ Plugin_manager::claim_file(Input_file* input_file, off_t offset, this->plugin_input_file_.offset = offset; this->plugin_input_file_.filesize = filesize; this->plugin_input_file_.handle = reinterpret_cast(handle); + if (elf_object != NULL) + this->objects_.push_back(elf_object); + this->in_claim_file_handler_ = true; for (this->current_ = this->plugins_.begin(); this->current_ != this->plugins_.end(); ++this->current_) { - if ((*this->current_)->claim_file(&this->plugin_input_file_)) + // If we aren't yet in replacement phase, allow plugins to claim input + // files, otherwise notify the plugin of the new input file, if needed. + if (!this->in_replacement_phase_) { - this->any_claimed_ = true; + if ((*this->current_)->claim_file(&this->plugin_input_file_)) + { + this->any_claimed_ = true; + this->in_claim_file_handler_ = false; - if (this->objects_.size() > handle) - return this->objects_[handle]; + if (this->recorder_ != NULL) + { + const std::string& objname = (elf_object == NULL + ? input_file->filename() + : elf_object->name()); + this->recorder_->claimed_file(objname, + offset, filesize, + (*this->current_)->filename()); + } + + if (this->objects_.size() > handle + && this->objects_[handle]->pluginobj() != NULL) + return this->objects_[handle]->pluginobj(); - // If the plugin claimed the file but did not call the - // add_symbols callback, we need to create the Pluginobj now. - Pluginobj* obj = this->make_plugin_object(handle); - return obj; + // If the plugin claimed the file but did not call the + // add_symbols callback, we need to create the Pluginobj now. + Pluginobj* obj = this->make_plugin_object(handle); + return obj; + } + } + else + { + (*this->current_)->new_input(&this->plugin_input_file_); } } + this->in_claim_file_handler_ = false; + + if (this->recorder_ != NULL) + this->recorder_->unclaimed_file(input_file->filename(), offset, filesize); + return NULL; } @@ -402,7 +832,7 @@ Plugin_manager::save_input_group(Input_group* input_group) void Plugin_manager::all_symbols_read(Workqueue* workqueue, Task* task, Input_objects* input_objects, - Symbol_table* symtab, Layout* layout, + Symbol_table* symtab, Dirsearch* dirpath, Mapfile* mapfile, Task_token** last_blocker) { @@ -411,11 +841,15 @@ Plugin_manager::all_symbols_read(Workqueue* workqueue, Task* task, this->task_ = task; this->input_objects_ = input_objects; this->symtab_ = symtab; - this->layout_ = layout; this->dirpath_ = dirpath; this->mapfile_ = mapfile; this->this_blocker_ = NULL; + // Set symbols used in defsym expressions as seen in real ELF. + Layout *layout = parameters->options().plugins()->layout(); + layout->script_options()->set_defsym_uses_in_real_elf(symtab); + layout->script_options()->find_defsym_defs(this->defsym_defines_set_); + for (this->current_ = this->plugins_.begin(); this->current_ != this->plugins_.end(); ++this->current_) @@ -586,6 +1020,14 @@ Plugin_manager::layout_deferred_objects() void Plugin_manager::cleanup() { + if (this->any_added_) + { + // If any input files were added, close all the input files. + // This is because the plugin may want to remove them, and on + // Windows you are not allowed to remove an open file. + close_all_descriptors(); + } + for (this->current_ = this->plugins_.begin(); this->current_ != this->plugins_.end(); ++this->current_) @@ -599,12 +1041,28 @@ Pluginobj* Plugin_manager::make_plugin_object(unsigned int handle) { // Make sure we aren't asked to make an object for the same handle twice. - if (this->objects_.size() != handle) + if (this->objects_.size() != handle + && this->objects_[handle]->pluginobj() != NULL) return NULL; - Pluginobj* obj = make_sized_plugin_object(this->input_file_, + const std::string* filename = &this->input_file_->filename(); + + // If the elf object for this file was pushed into the objects_ vector, + // use its filename, then delete it to make room for the Pluginobj as + // this file is claimed. + if (this->objects_.size() != handle) + { + filename = &this->objects_.back()->name(); + this->objects_.pop_back(); + } + + Pluginobj* obj = make_sized_plugin_object(*filename, + this->input_file_, this->plugin_input_file_.offset, this->plugin_input_file_.filesize); + + + this->objects_.push_back(obj); return obj; } @@ -616,7 +1074,7 @@ ld_plugin_status Plugin_manager::get_input_file(unsigned int handle, struct ld_plugin_input_file* file) { - Pluginobj* obj = this->object(handle); + Pluginobj* obj = this->object(handle)->pluginobj(); if (obj == NULL) return LDPS_BAD_HANDLE; @@ -634,7 +1092,11 @@ Plugin_manager::get_input_file(unsigned int handle, ld_plugin_status Plugin_manager::release_input_file(unsigned int handle) { - Pluginobj* obj = this->object(handle); + if (this->object(handle) == NULL) + return LDPS_BAD_HANDLE; + + Pluginobj* obj = this->object(handle)->pluginobj(); + if (obj == NULL) return LDPS_BAD_HANDLE; @@ -642,13 +1104,30 @@ Plugin_manager::release_input_file(unsigned int handle) return LDPS_OK; } +// Get the elf object corresponding to the handle. Return NULL if we +// found a Pluginobj instead. + +Object* +Plugin_manager::get_elf_object(const void* handle) +{ + Object* obj = this->object( + static_cast(reinterpret_cast(handle))); + + // The object should not be a Pluginobj. + if (obj == NULL + || obj->pluginobj() != NULL) + return NULL; + + return obj; +} + ld_plugin_status Plugin_manager::get_view(unsigned int handle, const void **viewp) { off_t offset; size_t filesize; Input_file *input_file; - if (this->objects_.size() == handle) + if (this->in_claim_file_handler_) { // We are being called from the claim_file hook. const struct ld_plugin_input_file &f = this->plugin_input_file_; @@ -659,7 +1138,9 @@ Plugin_manager::get_view(unsigned int handle, const void **viewp) else { // An already claimed file. - Pluginobj* obj = this->object(handle); + if (this->object(handle) == NULL) + return LDPS_BAD_HANDLE; + Pluginobj* obj = this->object(handle)->pluginobj(); if (obj == NULL) return LDPS_BAD_HANDLE; offset = obj->offset(); @@ -700,6 +1181,10 @@ Plugin_manager::add_input_file(const char* pathname, bool is_lib) if (parameters->incremental()) gold_error(_("input files added by plug-ins in --incremental mode not " "supported yet")); + + if (this->recorder_ != NULL) + this->recorder_->replacement_file(pathname, is_lib); + this->workqueue_->queue_soon(new Read_symbols(this->input_objects_, this->symtab_, this->layout_, @@ -725,11 +1210,13 @@ Pluginobj::Pluginobj(const std::string& name, Input_file* input_file, { } -// Return TRUE if a defined symbol might be reachable from outside the -// universe of claimed objects. +// Return TRUE if a defined symbol is referenced from outside the +// universe of claimed objects. Only references from relocatable, +// non-IR (unclaimed) objects count as a reference. References from +// dynamic objects count only as "visible". static inline bool -is_visible_from_outside(Symbol* lsym) +is_referenced_from_outside(Symbol* lsym) { if (lsym->in_real_elf()) return true; @@ -737,7 +1224,20 @@ is_visible_from_outside(Symbol* lsym) return true; if (parameters->options().is_undefined(lsym->name())) return true; - if (parameters->options().export_dynamic() || parameters->options().shared()) + return false; +} + +// Return TRUE if a defined symbol might be reachable from outside the +// load module. + +static inline bool +is_visible_from_outside(Symbol* lsym) +{ + if (lsym->in_dyn()) + return true; + if (parameters->options().export_dynamic() || parameters->options().shared() + || parameters->options().in_dynamic_list(lsym->name()) + || parameters->options().is_export_dynamic_symbol(lsym->name())) return lsym->is_externally_visible(); return false; } @@ -745,8 +1245,19 @@ is_visible_from_outside(Symbol* lsym) // Get symbol resolution info. ld_plugin_status -Pluginobj::get_symbol_resolution_info(int nsyms, ld_plugin_symbol* syms) const -{ +Pluginobj::get_symbol_resolution_info(Symbol_table* symtab, + int nsyms, + ld_plugin_symbol* syms, + int version) const +{ + // For version 1 of this interface, we cannot use + // LDPR_PREVAILING_DEF_IRONLY_EXP, so we return LDPR_PREVAILING_DEF + // instead. + const ld_plugin_symbol_resolution ldpr_prevailing_def_ironly_exp + = (version > 1 + ? LDPR_PREVAILING_DEF_IRONLY_EXP + : LDPR_PREVAILING_DEF); + if (nsyms > this->nsyms_) return LDPS_NO_SYMS; @@ -757,18 +1268,28 @@ Pluginobj::get_symbol_resolution_info(int nsyms, ld_plugin_symbol* syms) const gold_assert(this->symbols_.size() == 0); for (int i = 0; i < nsyms; i++) syms[i].resolution = LDPR_PREEMPTED_REG; - return LDPS_OK; + return version > 2 ? LDPS_NO_SYMS : LDPS_OK; } + Plugin_manager* plugins = parameters->options().plugins(); for (int i = 0; i < nsyms; i++) { ld_plugin_symbol* isym = &syms[i]; Symbol* lsym = this->symbols_[i]; + if (lsym->is_forwarder()) + lsym = symtab->resolve_forwards(lsym); ld_plugin_symbol_resolution res = LDPR_UNKNOWN; - if (lsym->is_undefined()) - // The symbol remains undefined. - res = LDPR_UNDEF; + if (plugins->is_defsym_def(lsym->name())) + { + // The symbol is redefined via defsym. + res = LDPR_PREEMPTED_REG; + } + else if (lsym->is_undefined()) + { + // The symbol remains undefined. + res = LDPR_UNDEF; + } else if (isym->def == LDPK_UNDEF || isym->def == LDPK_WEAKUNDEF || isym->def == LDPK_COMMON) @@ -777,9 +1298,14 @@ Pluginobj::get_symbol_resolution_info(int nsyms, ld_plugin_symbol* syms) const if (lsym->source() != Symbol::FROM_OBJECT) res = LDPR_RESOLVED_EXEC; else if (lsym->object()->pluginobj() == this) - res = (is_visible_from_outside(lsym) - ? LDPR_PREVAILING_DEF - : LDPR_PREVAILING_DEF_IRONLY); + { + if (is_referenced_from_outside(lsym)) + res = LDPR_PREVAILING_DEF; + else if (is_visible_from_outside(lsym)) + res = ldpr_prevailing_def_ironly_exp; + else + res = LDPR_PREVAILING_DEF_IRONLY; + } else if (lsym->object()->pluginobj() != NULL) res = LDPR_RESOLVED_IR; else if (lsym->object()->is_dynamic()) @@ -793,9 +1319,14 @@ Pluginobj::get_symbol_resolution_info(int nsyms, ld_plugin_symbol* syms) const if (lsym->source() != Symbol::FROM_OBJECT) res = LDPR_PREEMPTED_REG; else if (lsym->object() == static_cast(this)) - res = (is_visible_from_outside(lsym) - ? LDPR_PREVAILING_DEF - : LDPR_PREVAILING_DEF_IRONLY); + { + if (is_referenced_from_outside(lsym)) + res = LDPR_PREVAILING_DEF; + else if (is_visible_from_outside(lsym)) + res = ldpr_prevailing_def_ironly_exp; + else + res = LDPR_PREVAILING_DEF_IRONLY; + } else res = (lsym->object()->pluginobj() != NULL ? LDPR_PREEMPTED_IR @@ -869,7 +1400,9 @@ Sized_pluginobj::do_add_symbols(Symbol_table* symtab, elfcpp::Sym sym(symbuf); elfcpp::Sym_write osym(symbuf); - typedef typename elfcpp::Elf_types::Elf_WXword Elf_size_type; + Plugin_recorder* recorder = parameters->options().plugins()->recorder(); + if (recorder != NULL) + recorder->record_symbols(this, this->nsyms_, this->syms_); this->symbols_.resize(this->nsyms_); @@ -905,7 +1438,8 @@ Sized_pluginobj::do_add_symbols(Symbol_table* symtab, { case LDPK_DEF: case LDPK_WEAKDEF: - shndx = elfcpp::SHN_ABS; + // We use an arbitrary section number for a defined symbol. + shndx = 1; break; case LDPK_COMMON: shndx = elfcpp::SHN_COMMON; @@ -941,7 +1475,7 @@ Sized_pluginobj::do_add_symbols(Symbol_table* symtab, osym.put_st_name(0); osym.put_st_value(0); - osym.put_st_size(static_cast(isym->size)); + osym.put_st_size(0); osym.put_st_info(bind, elfcpp::STT_NOTYPE); osym.put_st_other(vis, 0); osym.put_st_shndx(shndx); @@ -965,6 +1499,8 @@ Sized_pluginobj::do_should_include_member( for (int i = 0; i < this->nsyms_; ++i) { const struct ld_plugin_symbol& sym = this->syms_[i]; + if (sym.def == LDPK_UNDEF || sym.def == LDPK_WEAKUNDEF) + continue; const char* name = sym.name; Symbol* symbol; Archive::Should_include t = Archive::should_include_member(symtab, @@ -985,6 +1521,32 @@ Sized_pluginobj::do_should_include_member( return Archive::SHOULD_INCLUDE_UNKNOWN; } +// Iterate over global symbols, calling a visitor class V for each. + +template +void +Sized_pluginobj::do_for_all_global_symbols( + Read_symbols_data*, + Library_base::Symbol_visitor_base* v) +{ + for (int i = 0; i < this->nsyms_; ++i) + { + const struct ld_plugin_symbol& sym = this->syms_[i]; + if (sym.def != LDPK_UNDEF) + v->visit(sym.name); + } +} + +// Iterate over local symbols, calling a visitor class V for each GOT offset +// associated with a local symbol. +template +void +Sized_pluginobj::do_for_all_local_got_entries( + Got_offset_list::Visitor*) const +{ + gold_unreachable(); +} + // Get the size of a section. Not used for plugin objects. template @@ -999,7 +1561,7 @@ Sized_pluginobj::do_section_size(unsigned int) template std::string -Sized_pluginobj::do_section_name(unsigned int) +Sized_pluginobj::do_section_name(unsigned int) const { gold_unreachable(); return std::string(); @@ -1008,13 +1570,14 @@ Sized_pluginobj::do_section_name(unsigned int) // Return a view of the contents of a section. Not used for plugin objects. template -Object::Location -Sized_pluginobj::do_section_contents(unsigned int) +const unsigned char* +Sized_pluginobj::do_section_contents( + unsigned int, + section_size_type*, + bool) { - Location loc(0, 0); - gold_unreachable(); - return loc; + return NULL; } // Return section flags. Not used for plugin objects. @@ -1097,14 +1660,18 @@ Sized_pluginobj::do_initialize_xindex() return NULL; } -// Get symbol counts. Not used for plugin objects. +// Get symbol counts. Don't count plugin objects; the replacement +// files will provide the counts. template void -Sized_pluginobj::do_get_global_symbol_counts(const Symbol_table*, - size_t*, size_t*) const +Sized_pluginobj::do_get_global_symbol_counts( + const Symbol_table*, + size_t* defined, + size_t* used) const { - gold_unreachable(); + *defined = 0; + *used = 0; } // Get symbols. Not used for plugin objects. @@ -1150,7 +1717,11 @@ class Plugin_finish : public Task void run(Workqueue*) { + Plugin_manager* plugins = parameters->options().plugins(); + gold_assert(plugins != NULL); // We could call early cleanup handlers here. + if (plugins->recorder()) + plugins->recorder()->finish(); } std::string @@ -1192,11 +1763,7 @@ void 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"); + Symbol* start_sym = this->symtab_->lookup(parameters->entry()); if (start_sym != NULL) start_sym->set_in_real_elf(); @@ -1204,7 +1771,6 @@ Plugin_hook::run(Workqueue* workqueue) this, this->input_objects_, this->symtab_, - this->layout_, this->dirpath_, this->mapfile_, &this->this_blocker_); @@ -1298,11 +1864,55 @@ static enum ld_plugin_status get_symbols(const void* handle, int nsyms, ld_plugin_symbol* syms) { gold_assert(parameters->options().has_plugins()); - Pluginobj* obj = parameters->options().plugins()->object( - static_cast(reinterpret_cast(handle))); + Plugin_manager* plugins = parameters->options().plugins(); + Object* obj = plugins->object( + static_cast(reinterpret_cast(handle))); if (obj == NULL) return LDPS_ERR; - return obj->get_symbol_resolution_info(nsyms, syms); + Pluginobj* plugin_obj = obj->pluginobj(); + if (plugin_obj == NULL) + return LDPS_ERR; + Symbol_table* symtab = plugins->symtab(); + return plugin_obj->get_symbol_resolution_info(symtab, nsyms, syms, 1); +} + +// Version 2 of the above. The only difference is that this version +// is allowed to return the resolution code LDPR_PREVAILING_DEF_IRONLY_EXP. + +static enum ld_plugin_status +get_symbols_v2(const void* handle, int nsyms, ld_plugin_symbol* syms) +{ + gold_assert(parameters->options().has_plugins()); + Plugin_manager* plugins = parameters->options().plugins(); + Object* obj = plugins->object( + static_cast(reinterpret_cast(handle))); + if (obj == NULL) + return LDPS_ERR; + Pluginobj* plugin_obj = obj->pluginobj(); + if (plugin_obj == NULL) + return LDPS_ERR; + Symbol_table* symtab = plugins->symtab(); + return plugin_obj->get_symbol_resolution_info(symtab, nsyms, syms, 2); +} + +// Version 3 of the above. The only difference from v2 is that it +// returns LDPS_NO_SYMS instead of LDPS_OK for the objects we never +// decided to include. + +static enum ld_plugin_status +get_symbols_v3(const void* handle, int nsyms, ld_plugin_symbol* syms) +{ + gold_assert(parameters->options().has_plugins()); + Plugin_manager* plugins = parameters->options().plugins(); + Object* obj = plugins->object( + static_cast(reinterpret_cast(handle))); + if (obj == NULL) + return LDPS_ERR; + Pluginobj* plugin_obj = obj->pluginobj(); + if (plugin_obj == NULL) + return LDPS_ERR; + Symbol_table* symtab = plugins->symtab(); + return plugin_obj->get_symbol_resolution_info(symtab, nsyms, syms, 3); } // Add a new (real) input file generated by a plugin. @@ -1362,12 +1972,297 @@ message(int level, const char* format, ...) return LDPS_OK; } +// Get the section count of the object corresponding to the handle. This +// plugin interface can only be called in the claim_file handler of the plugin. + +static enum ld_plugin_status +get_input_section_count(const void* handle, unsigned int* count) +{ + gold_assert(parameters->options().has_plugins()); + + if (!parameters->options().plugins()->in_claim_file_handler()) + return LDPS_ERR; + + Object* obj = parameters->options().plugins()->get_elf_object(handle); + + if (obj == NULL) + return LDPS_ERR; + + *count = obj->shnum(); + return LDPS_OK; +} + +// Get the type of the specified section in the object corresponding +// to the handle. This plugin interface can only be called in the +// claim_file handler of the plugin. + +static enum ld_plugin_status +get_input_section_type(const struct ld_plugin_section section, + unsigned int* type) +{ + gold_assert(parameters->options().has_plugins()); + + if (!parameters->options().plugins()->in_claim_file_handler()) + return LDPS_ERR; + + Object* obj + = parameters->options().plugins()->get_elf_object(section.handle); + + if (obj == NULL) + return LDPS_BAD_HANDLE; + + *type = obj->section_type(section.shndx); + return LDPS_OK; +} + +// Get the name of the specified section in the object corresponding +// to the handle. This plugin interface can only be called in the +// claim_file handler of the plugin. + +static enum ld_plugin_status +get_input_section_name(const struct ld_plugin_section section, + char** section_name_ptr) +{ + gold_assert(parameters->options().has_plugins()); + + if (!parameters->options().plugins()->in_claim_file_handler()) + return LDPS_ERR; + + Object* obj + = parameters->options().plugins()->get_elf_object(section.handle); + + if (obj == NULL) + return LDPS_BAD_HANDLE; + + // Check if the object is locked before getting the section name. + gold_assert(obj->is_locked()); + + const std::string section_name = obj->section_name(section.shndx); + *section_name_ptr = static_cast(malloc(section_name.length() + 1)); + memcpy(*section_name_ptr, section_name.c_str(), section_name.length() + 1); + return LDPS_OK; +} + +// Get the contents of the specified section in the object corresponding +// to the handle. This plugin interface can only be called in the +// claim_file handler of the plugin. + +static enum ld_plugin_status +get_input_section_contents(const struct ld_plugin_section section, + const unsigned char** section_contents_ptr, + size_t* len) +{ + gold_assert(parameters->options().has_plugins()); + + if (!parameters->options().plugins()->in_claim_file_handler()) + return LDPS_ERR; + + Object* obj + = parameters->options().plugins()->get_elf_object(section.handle); + + if (obj == NULL) + return LDPS_BAD_HANDLE; + + // Check if the object is locked before getting the section contents. + gold_assert(obj->is_locked()); + + section_size_type plen; + *section_contents_ptr + = obj->section_contents(section.shndx, &plen, false); + *len = plen; + return LDPS_OK; +} + +// Get the alignment of the specified section in the object corresponding +// to the handle. This plugin interface can only be called in the +// claim_file handler of the plugin. + +static enum ld_plugin_status +get_input_section_alignment(const struct ld_plugin_section section, + unsigned int* addralign) +{ + gold_assert(parameters->options().has_plugins()); + + if (!parameters->options().plugins()->in_claim_file_handler()) + return LDPS_ERR; + + Object* obj + = parameters->options().plugins()->get_elf_object(section.handle); + + if (obj == NULL) + return LDPS_BAD_HANDLE; + + *addralign = obj->section_addralign(section.shndx); + return LDPS_OK; +} + +// Get the size of the specified section in the object corresponding +// to the handle. This plugin interface can only be called in the +// claim_file handler of the plugin. + +static enum ld_plugin_status +get_input_section_size(const struct ld_plugin_section section, + uint64_t* secsize) +{ + gold_assert(parameters->options().has_plugins()); + + if (!parameters->options().plugins()->in_claim_file_handler()) + return LDPS_ERR; + + Object* obj + = parameters->options().plugins()->get_elf_object(section.handle); + + if (obj == NULL) + return LDPS_BAD_HANDLE; + + *secsize = obj->section_size(section.shndx); + return LDPS_OK; +} + +static enum ld_plugin_status +get_wrap_symbols(uint64_t *count, const char ***wrap_symbols) +{ + gold_assert(parameters->options().has_plugins()); + *count = parameters->options().wrap_size(); + + if (*count == 0) + return LDPS_OK; + + *wrap_symbols = new const char *[*count]; + int i = 0; + for (options::String_set::const_iterator + it = parameters->options().wrap_begin(); + it != parameters->options().wrap_end(); ++it, ++i) { + (*wrap_symbols)[i] = it->c_str(); + } + return LDPS_OK; +} + + +// Specify the ordering of sections in the final layout. The sections are +// specified as (handle,shndx) pairs in the two arrays in the order in +// which they should appear in the final layout. + +static enum ld_plugin_status +update_section_order(const struct ld_plugin_section* section_list, + unsigned int num_sections) +{ + gold_assert(parameters->options().has_plugins()); + + if (num_sections == 0) + return LDPS_OK; + + if (section_list == NULL) + return LDPS_ERR; + + Layout* layout = parameters->options().plugins()->layout(); + gold_assert (layout != NULL); + + std::map* order_map + = layout->get_section_order_map(); + + /* Store the mapping from Section_id to section position in layout's + order_map to consult after output sections are added. */ + for (unsigned int i = 0; i < num_sections; ++i) + { + Object* obj = parameters->options().plugins()->get_elf_object( + section_list[i].handle); + if (obj == NULL || obj->is_dynamic()) + return LDPS_BAD_HANDLE; + unsigned int shndx = section_list[i].shndx; + Section_id secn_id(static_cast(obj), shndx); + (*order_map)[secn_id] = i + 1; + } + + return LDPS_OK; +} + +// Let the linker know that the sections could be reordered. + +static enum ld_plugin_status +allow_section_ordering() +{ + gold_assert(parameters->options().has_plugins()); + Layout* layout = parameters->options().plugins()->layout(); + layout->set_section_ordering_specified(); + return LDPS_OK; +} + +// Let the linker know that a subset of sections could be mapped +// to a unique segment. + +static enum ld_plugin_status +allow_unique_segment_for_sections() +{ + gold_assert(parameters->options().has_plugins()); + Layout* layout = parameters->options().plugins()->layout(); + layout->set_unique_segment_for_sections_specified(); + return LDPS_OK; +} + +// This function should map the list of sections specified in the +// SECTION_LIST to a unique segment. ELF segments do not have names +// and the NAME is used to identify Output Section which should contain +// the list of sections. This Output Section will then be mapped to +// a unique segment. FLAGS is used to specify if any additional segment +// flags need to be set. For instance, a specific segment flag can be +// set to identify this segment. Unsetting segment flags is not possible. +// ALIGN specifies the alignment of the segment. + +static enum ld_plugin_status +unique_segment_for_sections(const char* segment_name, + uint64_t flags, + uint64_t align, + const struct ld_plugin_section* section_list, + unsigned int num_sections) +{ + gold_assert(parameters->options().has_plugins()); + + if (num_sections == 0) + return LDPS_OK; + + if (section_list == NULL) + return LDPS_ERR; + + Layout* layout = parameters->options().plugins()->layout(); + gold_assert (layout != NULL); + + Layout::Unique_segment_info* s = new Layout::Unique_segment_info; + s->name = segment_name; + s->flags = flags; + s->align = align; + + for (unsigned int i = 0; i < num_sections; ++i) + { + Object* obj = parameters->options().plugins()->get_elf_object( + section_list[i].handle); + if (obj == NULL || obj->is_dynamic()) + return LDPS_BAD_HANDLE; + unsigned int shndx = section_list[i].shndx; + Const_section_id secn_id(static_cast(obj), shndx); + layout->insert_section_segment_map(secn_id, s); + } + + return LDPS_OK; +} + +// Register a new_input handler. + +static enum ld_plugin_status +register_new_input(ld_plugin_new_input_handler handler) +{ + gold_assert(parameters->options().has_plugins()); + parameters->options().plugins()->set_new_input_handler(handler); + return LDPS_OK; +} + #endif // ENABLE_PLUGINS // Allocate a Pluginobj object of the appropriate size and endianness. static Pluginobj* -make_sized_plugin_object(Input_file* input_file, off_t offset, off_t filesize) +make_sized_plugin_object(const std::string& filename, + Input_file* input_file, off_t offset, off_t filesize) { Pluginobj* obj = NULL; @@ -1378,42 +2273,42 @@ make_sized_plugin_object(Input_file* input_file, off_t offset, off_t filesize) { if (target.is_big_endian()) #ifdef HAVE_TARGET_32_BIG - obj = new Sized_pluginobj<32, true>(input_file->filename(), - input_file, offset, filesize); + obj = new Sized_pluginobj<32, true>(filename, input_file, + offset, filesize); #else gold_error(_("%s: not configured to support " "32-bit big-endian object"), - input_file->filename().c_str()); + filename.c_str()); #endif else #ifdef HAVE_TARGET_32_LITTLE - obj = new Sized_pluginobj<32, false>(input_file->filename(), - input_file, offset, filesize); + obj = new Sized_pluginobj<32, false>(filename, input_file, + offset, filesize); #else gold_error(_("%s: not configured to support " "32-bit little-endian object"), - input_file->filename().c_str()); + filename.c_str()); #endif } else if (target.get_size() == 64) { if (target.is_big_endian()) #ifdef HAVE_TARGET_64_BIG - obj = new Sized_pluginobj<64, true>(input_file->filename(), - input_file, offset, filesize); + obj = new Sized_pluginobj<64, true>(filename, input_file, + offset, filesize); #else gold_error(_("%s: not configured to support " "64-bit big-endian object"), - input_file->filename().c_str()); + filename.c_str()); #endif else #ifdef HAVE_TARGET_64_LITTLE - obj = new Sized_pluginobj<64, false>(input_file->filename(), - input_file, offset, filesize); + obj = new Sized_pluginobj<64, false>(filename, input_file, + offset, filesize); #else gold_error(_("%s: not configured to support " "64-bit little-endian object"), - input_file->filename().c_str()); + filename.c_str()); #endif }