+2014-09-17 Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
+
+ * plugin.cc (Sized_pluginobj::do_add_symbols): Ignore isym->size.
+ * resolve.cc (Symbol_table::resolve): Don't override common symbols
+ during the replacement phase.
+
2014-09-17 Han Shen <shenhan@google.com>
Jing Yu <jingyu@google.com>
elfcpp::Sym<size, big_endian> sym(symbuf);
elfcpp::Sym_write<size, big_endian> osym(symbuf);
- typedef typename elfcpp::Elf_types<size>::Elf_WXword Elf_size_type;
-
this->symbols_.resize(this->nsyms_);
for (int i = 0; i < this->nsyms_; ++i)
osym.put_st_name(0);
osym.put_st_value(0);
- osym.put_st_size(static_cast<Elf_size_type>(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);
// If we're processing replacement files, allow new symbols to override
// the placeholders from the plugin objects.
+ // Treat common symbols specially since it is possible that an ELF
+ // file increased the size of the alignment.
if (to->source() == Symbol::FROM_OBJECT)
{
Pluginobj* obj = to->object()->pluginobj();
if (obj != NULL
- && parameters->options().plugins()->in_replacement_phase())
+ && parameters->options().plugins()->in_replacement_phase()
+ && !to->is_common())
{
this->override(to, sym, st_shndx, is_ordinary, object, version);
return;