Add generated files.

[platform/upstream/binutils.git] / gold / symtab.cc

diff --git a/gold/symtab.cc b/gold/symtab.cc
index 210ab25..c433018 100644 (file)
--- a/gold/symtab.cc
+++ b/gold/symtab.cc
@@ -547,7 +547,6 @@ Symbol::set_output_segment(Output_segment* os, Segment_offset_base base)
 void
 Symbol::set_undefined()
 {
-  gold_assert(this->is_predefined_);
   this->source_ = IS_UNDEFINED;
   this->is_predefined_ = false;
 }
@@ -980,7 +979,8 @@ Symbol_table::add_from_object(Object* object,
       gold_assert(ret != NULL);
 
       was_undefined = ret->is_undefined();
-      was_common = ret->is_common();
+      // Commons from plugins are just placeholders.
+      was_common = ret->is_common() && ret->object()->pluginobj() == NULL;
 
       this->resolve(ret, sym, st_shndx, is_ordinary, orig_st_shndx, object,
                    version);
@@ -1003,7 +1003,8 @@ Symbol_table::add_from_object(Object* object,
          ret = this->get_sized_symbol<size>(insdefault.first->second);
 
          was_undefined = ret->is_undefined();
-         was_common = ret->is_common();
+         // Commons from plugins are just placeholders.
+         was_common = ret->is_common() && ret->object()->pluginobj() == NULL;
 
          this->resolve(ret, sym, st_shndx, is_ordinary, orig_st_shndx, object,
                        version);
@@ -1066,8 +1067,10 @@ Symbol_table::add_from_object(Object* object,
     }
 
   // Keep track of common symbols, to speed up common symbol
-  // allocation.
-  if (!was_common && ret->is_common())
+  // allocation.  Don't record commons from plugin objects;
+  // we need to wait until we see the real symbol in the
+  // replacement file.
+  if (!was_common && ret->is_common() && ret->object()->pluginobj() == NULL)
     {
       if (ret->type() == elfcpp::STT_TLS)
        this->tls_commons_.push_back(ret);