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
add_input_file(const char *pathname);
sscanf(ver, "%d.%d", &major, &minor);
// Allocate and populate a transfer vector.
- const int tv_fixed_size = 23;
+ const int tv_fixed_size = 24;
int tv_size = this->args_.size() + tv_fixed_size;
ld_plugin_tv* tv = new ld_plugin_tv[tv_size];
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_ADD_INPUT_FILE;
tv[i].tv_u.tv_add_input_file = add_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;
return true;
if (parameters->options().is_undefined(lsym->name()))
return true;
+ 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())
return lsym->is_externally_visible();
return false;
// Get symbol resolution info.
ld_plugin_status
-Pluginobj::get_symbol_resolution_info(int nsyms, ld_plugin_symbol* syms) const
-{
+Pluginobj::get_symbol_resolution_info(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;
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())
if (lsym->source() != Symbol::FROM_OBJECT)
res = LDPR_PREEMPTED_REG;
else if (lsym->object() == static_cast<const Object*>(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
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<int size, bool big_endian>
void
-Sized_pluginobj<size, big_endian>::do_get_global_symbol_counts(const Symbol_table*,
- size_t*, size_t*) const
+Sized_pluginobj<size, big_endian>::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.
Pluginobj* plugin_obj = obj->pluginobj();
if (plugin_obj == NULL)
return LDPS_ERR;
- return plugin_obj->get_symbol_resolution_info(nsyms, syms);
+ return plugin_obj->get_symbol_resolution_info(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());
+ Object* obj = parameters->options().plugins()->object(
+ static_cast<unsigned int>(reinterpret_cast<intptr_t>(handle)));
+ if (obj == NULL)
+ return LDPS_ERR;
+ Pluginobj* plugin_obj = obj->pluginobj();
+ if (plugin_obj == NULL)
+ return LDPS_ERR;
+ return plugin_obj->get_symbol_resolution_info(nsyms, syms, 2);
}
// Add a new (real) input file generated by a plugin.
// which they should appear in the final layout.
static enum ld_plugin_status
-update_section_order(const struct ld_plugin_section *section_list,
+update_section_order(const struct ld_plugin_section* section_list,
unsigned int num_sections)
{
gold_assert(parameters->options().has_plugins());
if (section_list == NULL)
return LDPS_ERR;
- std::map<Section_id, unsigned int> order_map;
+ Layout* layout = parameters->options().plugins()->layout();
+ gold_assert (layout != NULL);
+
+ std::map<Section_id, unsigned int>* 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(
return LDPS_BAD_HANDLE;
unsigned int shndx = section_list[i].shndx;
Section_id secn_id(obj, shndx);
- order_map[secn_id] = i + 1;
+ (*order_map)[secn_id] = i + 1;
}
- Layout* layout = parameters->options().plugins()->layout();
- gold_assert (layout != NULL);
-
- for (Layout::Section_list::const_iterator p = layout->section_list().begin();
- p != layout->section_list().end();
- ++p)
- (*p)->update_section_layout(order_map);
-
return LDPS_OK;
}
projects / binutils.git / blobdiff