* gdb.base/default.exp (show version): Update the version text.
[binutils-gdb.git] / gold / symtab.cc
index 4d2bb1afecbf14283e24e66fbb194e126347eadb..68ce3b1efeeaae6287d9a3d3cc3e430775206b0e 100644 (file)
@@ -31,6 +31,7 @@ Symbol::init_fields(const char* name, const char* version,
   this->symtab_index_ = 0;
   this->dynsym_index_ = 0;
   this->got_offset_ = 0;
+  this->plt_offset_ = 0;
   this->type_ = type;
   this->binding_ = binding;
   this->visibility_ = visibility;
@@ -39,8 +40,10 @@ Symbol::init_fields(const char* name, const char* version,
   this->is_def_ = false;
   this->is_forwarder_ = false;
   this->needs_dynsym_entry_ = false;
+  this->in_reg_ = false;
   this->in_dyn_ = false;
   this->has_got_offset_ = false;
+  this->has_plt_offset_ = false;
   this->has_warning_ = false;
 }
 
@@ -55,8 +58,9 @@ Symbol::init_base(const char* name, const char* version, Object* object,
                    sym.get_st_visibility(), sym.get_st_nonvis());
   this->u_.from_object.object = object;
   // FIXME: Handle SHN_XINDEX.
-  this->u_.from_object.shnum = sym.get_st_shndx();
+  this->u_.from_object.shndx = sym.get_st_shndx();
   this->source_ = FROM_OBJECT;
+  this->in_reg_ = !object->is_dynamic();
   this->in_dyn_ = object->is_dynamic();
 }
 
@@ -72,6 +76,7 @@ Symbol::init_base(const char* name, Output_data* od, elfcpp::STT type,
   this->u_.in_output_data.output_data = od;
   this->u_.in_output_data.offset_is_from_end = offset_is_from_end;
   this->source_ = IN_OUTPUT_DATA;
+  this->in_reg_ = true;
 }
 
 // Initialize the fields in the base class Symbol for a symbol defined
@@ -86,6 +91,7 @@ Symbol::init_base(const char* name, Output_segment* os, elfcpp::STT type,
   this->u_.in_output_segment.output_segment = os;
   this->u_.in_output_segment.offset_base = offset_base;
   this->source_ = IN_OUTPUT_SEGMENT;
+  this->in_reg_ = true;
 }
 
 // Initialize the fields in the base class Symbol for a symbol defined
@@ -98,6 +104,7 @@ Symbol::init_base(const char* name, elfcpp::STT type,
 {
   this->init_fields(name, NULL, type, binding, visibility, nonvis);
   this->source_ = CONSTANT;
+  this->in_reg_ = true;
 }
 
 // Initialize the fields in Sized_symbol for SYM in OBJECT.
@@ -248,8 +255,8 @@ Symbol_table::lookup(const char* name, const char* version) const
 
 template<int size, bool big_endian>
 void
-Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from
-                      ACCEPT_SIZE_ENDIAN)
+Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from,
+                     const char* version ACCEPT_SIZE_ENDIAN)
 {
   unsigned char buf[elfcpp::Elf_sizes<size>::sym_size];
   elfcpp::Sym_write<size, big_endian> esym(buf);
@@ -258,8 +265,12 @@ Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from
   esym.put_st_size(from->symsize());
   esym.put_st_info(from->binding(), from->type());
   esym.put_st_other(from->visibility(), from->nonvis());
-  esym.put_st_shndx(from->shnum());
-  Symbol_table::resolve(to, esym.sym(), from->object());
+  esym.put_st_shndx(from->shndx());
+  Symbol_table::resolve(to, esym.sym(), from->object(), version);
+  if (from->in_reg())
+    to->set_in_reg();
+  if (from->in_dyn())
+    to->set_in_dyn();
 }
 
 // Add one symbol from OBJECT to the symbol table.  NAME is symbol
@@ -328,7 +339,7 @@ Symbol_table::add_from_object(Object* object,
       was_undefined = ret->is_undefined();
       was_common = ret->is_common();
 
-      Symbol_table::resolve(ret, sym, object);
+      Symbol_table::resolve(ret, sym, object, version);
 
       if (def)
        {
@@ -347,7 +358,7 @@ Symbol_table::add_from_object(Object* object,
                insdef.first->second
                 SELECT_SIZE(size));
              Symbol_table::resolve SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
-               ret, sym2 SELECT_SIZE_ENDIAN(size, big_endian));
+               ret, sym2, version SELECT_SIZE_ENDIAN(size, big_endian));
              this->make_forwarder(insdef.first->second, ret);
              insdef.first->second = ret;
            }
@@ -363,12 +374,12 @@ Symbol_table::add_from_object(Object* object,
 
       if (def && !insdef.second)
        {
-         // We already have an entry for NAME/NULL.  Make
-         // NAME/VERSION point to it.
+         // We already have an entry for NAME/NULL.  If we override
+         // it, then change it to NAME/VERSION.
          ret = this->get_sized_symbol SELECT_SIZE_NAME(size) (
               insdef.first->second
               SELECT_SIZE(size));
-         Symbol_table::resolve(ret, sym, object);
+         Symbol_table::resolve(ret, sym, object, version);
          ins.first->second = ret;
        }
       else
@@ -649,8 +660,8 @@ Symbol_table::add_from_dynobj(
 
 template<int size, bool big_endian>
 Sized_symbol<size>*
-Symbol_table::define_special_symbol(Target* target, const char* name,
-                                   bool only_if_ref
+Symbol_table::define_special_symbol(const Target* target, const char* name,
+                                   const char* version, bool only_if_ref
                                     ACCEPT_SIZE_ENDIAN)
 {
   gold_assert(this->size_ == size);
@@ -660,29 +671,34 @@ Symbol_table::define_special_symbol(Target* target, const char* name,
 
   if (only_if_ref)
     {
-      oldsym = this->lookup(name, NULL);
+      oldsym = this->lookup(name, version);
       if (oldsym == NULL || !oldsym->is_undefined())
        return NULL;
       sym = NULL;
 
-      // Canonicalize NAME.
+      // Canonicalize NAME and VERSION.
       name = oldsym->name();
+      version = oldsym->version();
     }
   else
     {
-      // Canonicalize NAME.
+      // Canonicalize NAME and VERSION.
       Stringpool::Key name_key;
       name = this->namepool_.add(name, &name_key);
 
+      Stringpool::Key version_key = 0;
+      if (version != NULL)
+       version = this->namepool_.add(version, &version_key);
+
       Symbol* const snull = NULL;
-      const Stringpool::Key ver_key = 0;
       std::pair<typename Symbol_table_type::iterator, bool> ins =
-       this->table_.insert(std::make_pair(std::make_pair(name_key, ver_key),
+       this->table_.insert(std::make_pair(std::make_pair(name_key,
+                                                         version_key),
                                           snull));
 
       if (!ins.second)
        {
-         // We already have a symbol table entry for NAME.
+         // We already have a symbol table entry for NAME/VERSION.
          oldsym = ins.first->second;
          gold_assert(oldsym != NULL);
          sym = NULL;
@@ -699,7 +715,8 @@ Symbol_table::define_special_symbol(Target* target, const char* name,
              gold_assert(target->get_size() == size);
              gold_assert(target->is_big_endian() ? big_endian : !big_endian);
              typedef Sized_target<size, big_endian> My_target;
-             My_target* sized_target = static_cast<My_target*>(target);
+             const My_target* sized_target =
+               static_cast<const My_target*>(target);
              sym = sized_target->make_symbol();
              if (sym == NULL)
                return NULL;
@@ -717,9 +734,9 @@ Symbol_table::define_special_symbol(Target* target, const char* name,
       sym = this->get_sized_symbol SELECT_SIZE_NAME(size) (oldsym
                                                            SELECT_SIZE(size));
       gold_assert(sym->source() == Symbol::FROM_OBJECT);
-      const int old_shnum = sym->shnum();
-      if (old_shnum != elfcpp::SHN_UNDEF
-         && old_shnum != elfcpp::SHN_COMMON
+      const int old_shndx = sym->shndx();
+      if (old_shndx != elfcpp::SHN_UNDEF
+         && old_shndx != elfcpp::SHN_COMMON
          && !sym->object()->is_dynamic())
        {
          fprintf(stderr, "%s: linker defined: multiple definition of %s\n",
@@ -737,9 +754,9 @@ Symbol_table::define_special_symbol(Target* target, const char* name,
 
 // Define a symbol based on an Output_data.
 
-void
-Symbol_table::define_in_output_data(Target* target, const char* name,
-                                   Output_data* od,
+Symbol*
+Symbol_table::define_in_output_data(const Target* target, const char* name,
+                                   const char* version, Output_data* od,
                                    uint64_t value, uint64_t symsize,
                                    elfcpp::STT type, elfcpp::STB binding,
                                    elfcpp::STV visibility,
@@ -749,13 +766,15 @@ Symbol_table::define_in_output_data(Target* target, const char* name,
 {
   gold_assert(target->get_size() == this->size_);
   if (this->size_ == 32)
-    this->do_define_in_output_data<32>(target, name, od, value, symsize,
-                                      type, binding, visibility, nonvis,
-                                      offset_is_from_end, only_if_ref);
+    return this->do_define_in_output_data<32>(target, name, version, od, value,
+                                             symsize, type, binding,
+                                             visibility, nonvis,
+                                             offset_is_from_end, only_if_ref);
   else if (this->size_ == 64)
-    this->do_define_in_output_data<64>(target, name, od, value, symsize,
-                                      type, binding, visibility, nonvis,
-                                      offset_is_from_end, only_if_ref);
+    return this->do_define_in_output_data<64>(target, name, version, od, value,
+                                             symsize, type, binding,
+                                             visibility, nonvis,
+                                             offset_is_from_end, only_if_ref);
   else
     gold_unreachable();
 }
@@ -763,10 +782,11 @@ Symbol_table::define_in_output_data(Target* target, const char* name,
 // Define a symbol in an Output_data, sized version.
 
 template<int size>
-void
+Sized_symbol<size>*
 Symbol_table::do_define_in_output_data(
-    Target* target,
+    const Target* target,
     const char* name,
+    const char* version,
     Output_data* od,
     typename elfcpp::Elf_types<size>::Elf_Addr value,
     typename elfcpp::Elf_types<size>::Elf_WXword symsize,
@@ -781,25 +801,27 @@ Symbol_table::do_define_in_output_data(
 
   if (target->is_big_endian())
     sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) (
-        target, name, only_if_ref
+       target, name, version, only_if_ref
         SELECT_SIZE_ENDIAN(size, true));
   else
     sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) (
-        target, name, only_if_ref
+        target, name, version, only_if_ref
         SELECT_SIZE_ENDIAN(size, false));
 
   if (sym == NULL)
-    return;
+    return NULL;
 
   sym->init(name, od, value, symsize, type, binding, visibility, nonvis,
            offset_is_from_end);
+
+  return sym;
 }
 
 // Define a symbol based on an Output_segment.
 
-void
-Symbol_table::define_in_output_segment(Target* target, const char* name,
-                                      Output_segment* os,
+Symbol*
+Symbol_table::define_in_output_segment(const Target* target, const char* name,
+                                      const char* version, Output_segment* os,
                                       uint64_t value, uint64_t symsize,
                                       elfcpp::STT type, elfcpp::STB binding,
                                       elfcpp::STV visibility,
@@ -809,13 +831,15 @@ Symbol_table::define_in_output_segment(Target* target, const char* name,
 {
   gold_assert(target->get_size() == this->size_);
   if (this->size_ == 32)
-    this->do_define_in_output_segment<32>(target, name, os, value, symsize,
-                                         type, binding, visibility, nonvis,
-                                         offset_base, only_if_ref);
+    return this->do_define_in_output_segment<32>(target, name, version, os,
+                                                value, symsize, type, binding,
+                                                visibility, nonvis,
+                                                offset_base, only_if_ref);
   else if (this->size_ == 64)
-    this->do_define_in_output_segment<64>(target, name, os, value, symsize,
-                                         type, binding, visibility, nonvis,
-                                         offset_base, only_if_ref);
+    return this->do_define_in_output_segment<64>(target, name, version, os,
+                                                value, symsize, type, binding,
+                                                visibility, nonvis,
+                                                offset_base, only_if_ref);
   else
     gold_unreachable();
 }
@@ -823,10 +847,11 @@ Symbol_table::define_in_output_segment(Target* target, const char* name,
 // Define a symbol in an Output_segment, sized version.
 
 template<int size>
-void
+Sized_symbol<size>*
 Symbol_table::do_define_in_output_segment(
-    Target* target,
+    const Target* target,
     const char* name,
+    const char* version,
     Output_segment* os,
     typename elfcpp::Elf_types<size>::Elf_Addr value,
     typename elfcpp::Elf_types<size>::Elf_WXword symsize,
@@ -841,39 +866,41 @@ Symbol_table::do_define_in_output_segment(
 
   if (target->is_big_endian())
     sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) (
-        target, name, only_if_ref
+        target, name, version, only_if_ref
         SELECT_SIZE_ENDIAN(size, true));
   else
     sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) (
-        target, name, only_if_ref
+        target, name, version, only_if_ref
         SELECT_SIZE_ENDIAN(size, false));
 
   if (sym == NULL)
-    return;
+    return NULL;
 
   sym->init(name, os, value, symsize, type, binding, visibility, nonvis,
            offset_base);
+
+  return sym;
 }
 
 // Define a special symbol with a constant value.  It is a multiple
 // definition error if this symbol is already defined.
 
-void
-Symbol_table::define_as_constant(Target* target, const char* name,
-                                uint64_t value, uint64_t symsize,
-                                elfcpp::STT type, elfcpp::STB binding,
-                                elfcpp::STV visibility, unsigned char nonvis,
-                                bool only_if_ref)
+Symbol*
+Symbol_table::define_as_constant(const Target* target, const char* name,
+                                const char* version, uint64_t value,
+                                uint64_t symsize, elfcpp::STT type,
+                                elfcpp::STB binding, elfcpp::STV visibility,
+                                unsigned char nonvis, bool only_if_ref)
 {
   gold_assert(target->get_size() == this->size_);
   if (this->size_ == 32)
-    this->do_define_as_constant<32>(target, name, value, symsize,
-                                   type, binding, visibility, nonvis,
-                                   only_if_ref);
+    return this->do_define_as_constant<32>(target, name, version, value,
+                                          symsize, type, binding, visibility,
+                                          nonvis, only_if_ref);
   else if (this->size_ == 64)
-    this->do_define_as_constant<64>(target, name, value, symsize,
-                                   type, binding, visibility, nonvis,
-                                   only_if_ref);
+    return this->do_define_as_constant<64>(target, name, version, value,
+                                          symsize, type, binding, visibility,
+                                          nonvis, only_if_ref);
   else
     gold_unreachable();
 }
@@ -881,10 +908,11 @@ Symbol_table::define_as_constant(Target* target, const char* name,
 // Define a symbol as a constant, sized version.
 
 template<int size>
-void
+Sized_symbol<size>*
 Symbol_table::do_define_as_constant(
-    Target* target,
+    const Target* target,
     const char* name,
+    const char* version,
     typename elfcpp::Elf_types<size>::Elf_Addr value,
     typename elfcpp::Elf_types<size>::Elf_WXword symsize,
     elfcpp::STT type,
@@ -897,35 +925,37 @@ Symbol_table::do_define_as_constant(
 
   if (target->is_big_endian())
     sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, true) (
-        target, name, only_if_ref
+        target, name, version, only_if_ref
         SELECT_SIZE_ENDIAN(size, true));
   else
     sym = this->define_special_symbol SELECT_SIZE_ENDIAN_NAME(size, false) (
-        target, name, only_if_ref
+        target, name, version, only_if_ref
         SELECT_SIZE_ENDIAN(size, false));
 
   if (sym == NULL)
-    return;
+    return NULL;
 
   sym->init(name, value, symsize, type, binding, visibility, nonvis);
+
+  return sym;
 }
 
 // Define a set of symbols in output sections.
 
 void
-Symbol_table::define_symbols(const Layout* layout, Target* target, int count,
-                            const Define_symbol_in_section* p)
+Symbol_table::define_symbols(const Layout* layout, const Target* target,
+                            int count, const Define_symbol_in_section* p)
 {
   for (int i = 0; i < count; ++i, ++p)
     {
       Output_section* os = layout->find_output_section(p->output_section);
       if (os != NULL)
-       this->define_in_output_data(target, p->name, os, p->value, p->size,
-                                   p->type, p->binding, p->visibility,
-                                   p->nonvis, p->offset_is_from_end,
-                                   p->only_if_ref);
+       this->define_in_output_data(target, p->name, NULL, os, p->value,
+                                   p->size, p->type, p->binding,
+                                   p->visibility, p->nonvis,
+                                   p->offset_is_from_end, p->only_if_ref);
       else
-       this->define_as_constant(target, p->name, 0, p->size, p->type,
+       this->define_as_constant(target, p->name, NULL, 0, p->size, p->type,
                                 p->binding, p->visibility, p->nonvis,
                                 p->only_if_ref);
     }
@@ -934,8 +964,8 @@ Symbol_table::define_symbols(const Layout* layout, Target* target, int count,
 // Define a set of symbols in output segments.
 
 void
-Symbol_table::define_symbols(const Layout* layout, Target* target, int count,
-                            const Define_symbol_in_segment* p)
+Symbol_table::define_symbols(const Layout* layout, const Target* target,
+                            int count, const Define_symbol_in_segment* p)
 {
   for (int i = 0; i < count; ++i, ++p)
     {
@@ -943,12 +973,12 @@ Symbol_table::define_symbols(const Layout* layout, Target* target, int count,
                                                       p->segment_flags_set,
                                                       p->segment_flags_clear);
       if (os != NULL)
-       this->define_in_output_segment(target, p->name, os, p->value, p->size,
-                                      p->type, p->binding, p->visibility,
-                                      p->nonvis, p->offset_base,
-                                      p->only_if_ref);
+       this->define_in_output_segment(target, p->name, NULL, os, p->value,
+                                      p->size, p->type, p->binding,
+                                      p->visibility, p->nonvis,
+                                      p->offset_base, p->only_if_ref);
       else
-       this->define_as_constant(target, p->name, 0, p->size, p->type,
+       this->define_as_constant(target, p->name, NULL, 0, p->size, p->type,
                                 p->binding, p->visibility, p->nonvis,
                                 p->only_if_ref);
     }
@@ -960,24 +990,45 @@ Symbol_table::define_symbols(const Layout* layout, Target* target, int count,
 // updated dynamic symbol index.
 
 unsigned int
-Symbol_table::set_dynsym_indexes(unsigned int index,
+Symbol_table::set_dynsym_indexes(const General_options* options,
+                                const Target* target,
+                                unsigned int index,
                                 std::vector<Symbol*>* syms,
-                                Stringpool* dynpool)
+                                Stringpool* dynpool,
+                                Versions* versions)
 {
   for (Symbol_table_type::iterator p = this->table_.begin();
        p != this->table_.end();
        ++p)
     {
       Symbol* sym = p->second;
-      if (sym->needs_dynsym_entry())
+
+      // Note that SYM may already have a dynamic symbol index, since
+      // some symbols appear more than once in the symbol table, with
+      // and without a version.
+
+      if (!sym->needs_dynsym_entry()
+          && (!options->export_dynamic()
+              || !sym->in_reg()
+              || !sym->is_externally_visible()))
+       sym->set_dynsym_index(-1U);
+      else if (!sym->has_dynsym_index())
        {
          sym->set_dynsym_index(index);
          ++index;
          syms->push_back(sym);
          dynpool->add(sym->name(), NULL);
+
+         // Record any version information.
+         if (sym->version() != NULL)
+           versions->record_version(options, dynpool, sym);
        }
     }
 
+  // Finish up the versions.  In some cases this may add new dynamic
+  // symbols.
+  index = versions->finalize(target, this, index, syms);
+
   return index;
 }
 
@@ -986,13 +1037,19 @@ Symbol_table::set_dynsym_indexes(unsigned int index,
 // OFF.  Add their names to POOL.  Return the new file offset.
 
 off_t
-Symbol_table::finalize(unsigned int index, off_t off, Stringpool* pool)
+Symbol_table::finalize(unsigned int index, off_t off, off_t dynoff,
+                      size_t dyn_global_index, size_t dyncount,
+                      Stringpool* pool)
 {
   off_t ret;
 
   gold_assert(index != 0);
   this->first_global_index_ = index;
 
+  this->dynamic_offset_ = dynoff;
+  this->first_dynamic_global_index_ = dyn_global_index;
+  this->dynamic_count_ = dyncount;
+
   if (this->size_ == 32)
     ret = this->sized_finalize<32>(index, off, pool);
   else if (this->size_ == 64)
@@ -1035,20 +1092,28 @@ Symbol_table::sized_finalize(unsigned index, off_t off, Stringpool* pool)
       if (sym->has_symtab_index())
        continue;
 
+      if (!sym->in_reg())
+       {
+         gold_assert(!sym->has_symtab_index());
+         sym->set_symtab_index(-1U);
+         gold_assert(sym->dynsym_index() == -1U);
+         continue;
+       }
+
       typename Sized_symbol<size>::Value_type value;
 
       switch (sym->source())
        {
        case Symbol::FROM_OBJECT:
          {
-           unsigned int shnum = sym->shnum();
+           unsigned int shndx = sym->shndx();
 
            // FIXME: We need some target specific support here.
-           if (shnum >= elfcpp::SHN_LORESERVE
-               && shnum != elfcpp::SHN_ABS)
+           if (shndx >= elfcpp::SHN_LORESERVE
+               && shndx != elfcpp::SHN_ABS)
              {
                fprintf(stderr, _("%s: %s: unsupported symbol section 0x%x\n"),
-                       program_name, sym->name(), shnum);
+                       program_name, sym->name(), shndx);
                gold_exit(false);
              }
 
@@ -1056,21 +1121,22 @@ Symbol_table::sized_finalize(unsigned index, off_t off, Stringpool* pool)
            if (symobj->is_dynamic())
              {
                value = 0;
-               shnum = elfcpp::SHN_UNDEF;
+               shndx = elfcpp::SHN_UNDEF;
              }
-           else if (shnum == elfcpp::SHN_UNDEF)
+           else if (shndx == elfcpp::SHN_UNDEF)
              value = 0;
-           else if (shnum == elfcpp::SHN_ABS)
+           else if (shndx == elfcpp::SHN_ABS)
              value = sym->value();
            else
              {
                Relobj* relobj = static_cast<Relobj*>(symobj);
                off_t secoff;
-               Output_section* os = relobj->output_section(shnum, &secoff);
+               Output_section* os = relobj->output_section(shndx, &secoff);
 
                if (os == NULL)
                  {
                    sym->set_symtab_index(-1U);
+                   gold_assert(sym->dynsym_index() == -1U);
                    continue;
                  }
 
@@ -1132,21 +1198,21 @@ Symbol_table::sized_finalize(unsigned index, off_t off, Stringpool* pool)
 
 void
 Symbol_table::write_globals(const Target* target, const Stringpool* sympool,
-                           Output_file* of) const
+                           const Stringpool* dynpool, Output_file* of) const
 {
   if (this->size_ == 32)
     {
       if (target->is_big_endian())
-       this->sized_write_globals<32, true>(target, sympool, of);
+       this->sized_write_globals<32, true>(target, sympool, dynpool, of);
       else
-       this->sized_write_globals<32, false>(target, sympool, of);
+       this->sized_write_globals<32, false>(target, sympool, dynpool, of);
     }
   else if (this->size_ == 64)
     {
       if (target->is_big_endian())
-       this->sized_write_globals<64, true>(target, sympool, of);
+       this->sized_write_globals<64, true>(target, sympool, dynpool, of);
       else
-       this->sized_write_globals<64, false>(target, sympool, of);
+       this->sized_write_globals<64, false>(target, sympool, dynpool, of);
     }
   else
     gold_unreachable();
@@ -1158,12 +1224,22 @@ template<int size, bool big_endian>
 void
 Symbol_table::sized_write_globals(const Target*,
                                  const Stringpool* sympool,
+                                 const Stringpool* dynpool,
                                  Output_file* of) const
 {
   const int sym_size = elfcpp::Elf_sizes<size>::sym_size;
   unsigned int index = this->first_global_index_;
   const off_t oview_size = this->output_count_ * sym_size;
-  unsigned char* psyms = of->get_output_view(this->offset_, oview_size);
+  unsigned char* const psyms = of->get_output_view(this->offset_, oview_size);
+
+  unsigned int dynamic_count = this->dynamic_count_;
+  off_t dynamic_size = dynamic_count * sym_size;
+  unsigned int first_dynamic_global_index = this->first_dynamic_global_index_;
+  unsigned char* dynamic_view;
+  if (this->dynamic_offset_ == 0)
+    dynamic_view = NULL;
+  else
+    dynamic_view = of->get_output_view(this->dynamic_offset_, dynamic_size);
 
   unsigned char* ps = psyms;
   for (Symbol_table_type::const_iterator p = this->table_.begin();
@@ -1173,33 +1249,43 @@ Symbol_table::sized_write_globals(const Target*,
       Sized_symbol<size>* sym = static_cast<Sized_symbol<size>*>(p->second);
 
       unsigned int sym_index = sym->symtab_index();
-      if (sym_index == -1U)
+      unsigned int dynsym_index;
+      if (dynamic_view == NULL)
+       dynsym_index = -1U;
+      else
+       dynsym_index = sym->dynsym_index();
+
+      if (sym_index == -1U && dynsym_index == -1U)
        {
          // This symbol is not included in the output file.
          continue;
        }
-      if (sym_index != index)
+
+      if (sym_index == index)
+       ++index;
+      else if (sym_index != -1U)
        {
          // We have already seen this symbol, because it has a
          // default version.
          gold_assert(sym_index < index);
-         continue;
+         if (dynsym_index == -1U)
+           continue;
+         sym_index = -1U;
        }
-      ++index;
 
       unsigned int shndx;
       switch (sym->source())
        {
        case Symbol::FROM_OBJECT:
          {
-           unsigned int shnum = sym->shnum();
+           unsigned int in_shndx = sym->shndx();
 
            // FIXME: We need some target specific support here.
-           if (shnum >= elfcpp::SHN_LORESERVE
-               && shnum != elfcpp::SHN_ABS)
+           if (in_shndx >= elfcpp::SHN_LORESERVE
+               && in_shndx != elfcpp::SHN_ABS)
              {
                fprintf(stderr, _("%s: %s: unsupported symbol section 0x%x\n"),
-                       program_name, sym->name(), sym->shnum());
+                       program_name, sym->name(), in_shndx);
                gold_exit(false);
              }
 
@@ -1209,13 +1295,14 @@ Symbol_table::sized_write_globals(const Target*,
                // FIXME.
                shndx = elfcpp::SHN_UNDEF;
              }
-           else if (shnum == elfcpp::SHN_UNDEF || shnum == elfcpp::SHN_ABS)
-             shndx = shnum;
+           else if (in_shndx == elfcpp::SHN_UNDEF
+                    || in_shndx == elfcpp::SHN_ABS)
+             shndx = in_shndx;
            else
              {
                Relobj* relobj = static_cast<Relobj*>(symobj);
                off_t secoff;
-               Output_section* os = relobj->output_section(shnum, &secoff);
+               Output_section* os = relobj->output_section(in_shndx, &secoff);
                gold_assert(os != NULL);
                shndx = os->out_shndx();
              }
@@ -1238,21 +1325,50 @@ Symbol_table::sized_write_globals(const Target*,
          gold_unreachable();
        }
 
-      elfcpp::Sym_write<size, big_endian> osym(ps);
-      osym.put_st_name(sympool->get_offset(sym->name()));
-      osym.put_st_value(sym->value());
-      osym.put_st_size(sym->symsize());
-      osym.put_st_info(elfcpp::elf_st_info(sym->binding(), sym->type()));
-      osym.put_st_other(elfcpp::elf_st_other(sym->visibility(),
-                                            sym->nonvis()));
-      osym.put_st_shndx(shndx);
+      if (sym_index != -1U)
+       {
+         this->sized_write_symbol SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
+              sym, shndx, sympool, ps
+              SELECT_SIZE_ENDIAN(size, big_endian));
+         ps += sym_size;
+       }
 
-      ps += sym_size;
+      if (dynsym_index != -1U)
+       {
+         dynsym_index -= first_dynamic_global_index;
+         gold_assert(dynsym_index < dynamic_count);
+         unsigned char* pd = dynamic_view + (dynsym_index * sym_size);
+         this->sized_write_symbol SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
+              sym, shndx, dynpool, pd
+              SELECT_SIZE_ENDIAN(size, big_endian));
+       }
     }
 
   gold_assert(ps - psyms == oview_size);
 
   of->write_output_view(this->offset_, oview_size, psyms);
+  if (dynamic_view != NULL)
+    of->write_output_view(this->dynamic_offset_, dynamic_size, dynamic_view);
+}
+
+// Write out the symbol SYM, in section SHNDX, to P.  POOL is the
+// strtab holding the name.
+
+template<int size, bool big_endian>
+void
+Symbol_table::sized_write_symbol(Sized_symbol<size>* sym,
+                                unsigned int shndx,
+                                const Stringpool* pool,
+                                unsigned char* p
+                                 ACCEPT_SIZE_ENDIAN) const
+{
+  elfcpp::Sym_write<size, big_endian> osym(p);
+  osym.put_st_name(pool->get_offset(sym->name()));
+  osym.put_st_value(sym->value());
+  osym.put_st_size(sym->symsize());
+  osym.put_st_info(elfcpp::elf_st_info(sym->binding(), sym->type()));
+  osym.put_st_other(elfcpp::elf_st_other(sym->visibility(), sym->nonvis()));
+  osym.put_st_shndx(shndx);
 }
 
 // Write out a section symbol.  Return the update offset.