OSDN Git Service

* options.cc (General_options::parse_version): Allow -v to exit
[pf3gnuchains/pf3gnuchains3x.git] / gold / dynobj.cc
index a6f3588..ebb5f33 100644 (file)
@@ -1,6 +1,6 @@
 // dynobj.cc -- dynamic object support for gold
 
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -27,6 +27,7 @@
 
 #include "elfcpp.h"
 #include "parameters.h"
+#include "script.h"
 #include "symtab.h"
 #include "dynobj.h"
 
@@ -71,7 +72,10 @@ Sized_dynobj<size, big_endian>::Sized_dynobj(
     off_t offset,
     const elfcpp::Ehdr<size, big_endian>& ehdr)
   : Dynobj(name, input_file, offset),
-    elf_file_(this, ehdr)
+    elf_file_(this, ehdr),
+    dynsym_shndx_(-1U),
+    symbols_(NULL),
+    defined_count_(0)
 {
 }
 
@@ -79,13 +83,8 @@ Sized_dynobj<size, big_endian>::Sized_dynobj(
 
 template<int size, bool big_endian>
 void
-Sized_dynobj<size, big_endian>::setup(
-    const elfcpp::Ehdr<size, big_endian>& ehdr)
+Sized_dynobj<size, big_endian>::setup()
 {
-  this->set_target(ehdr.get_e_machine(), size, big_endian,
-                  ehdr.get_e_ident()[elfcpp::EI_OSABI],
-                  ehdr.get_e_ident()[elfcpp::EI_ABIVERSION]);
-
   const unsigned int shnum = this->elf_file_.shnum();
   this->set_shnum(shnum);
 }
@@ -97,18 +96,18 @@ template<int size, bool big_endian>
 void
 Sized_dynobj<size, big_endian>::find_dynsym_sections(
     const unsigned char* pshdrs,
-    unsigned int* pdynsym_shndx,
     unsigned int* pversym_shndx,
     unsigned int* pverdef_shndx,
     unsigned int* pverneed_shndx,
     unsigned int* pdynamic_shndx)
 {
-  *pdynsym_shndx = -1U;
   *pversym_shndx = -1U;
   *pverdef_shndx = -1U;
   *pverneed_shndx = -1U;
   *pdynamic_shndx = -1U;
 
+  unsigned int xindex_shndx = 0;
+  unsigned int xindex_link = 0;
   const unsigned int shnum = this->shnum();
   const unsigned char* p = pshdrs;
   for (unsigned int i = 0; i < shnum; ++i, p += This::shdr_size)
@@ -119,7 +118,15 @@ Sized_dynobj<size, big_endian>::find_dynsym_sections(
       switch (shdr.get_sh_type())
        {
        case elfcpp::SHT_DYNSYM:
-         pi = pdynsym_shndx;
+         this->dynsym_shndx_ = i;
+         if (xindex_shndx > 0 && xindex_link == i)
+           {
+             Xindex* xindex = new Xindex(this->elf_file_.large_shndx_offset());
+             xindex->read_symtab_xindex<size, big_endian>(this, xindex_shndx,
+                                                          pshdrs);
+             this->set_xindex(xindex);
+           }
+         pi = NULL;
          break;
        case elfcpp::SHT_GNU_versym:
          pi = pversym_shndx;
@@ -133,6 +140,18 @@ Sized_dynobj<size, big_endian>::find_dynsym_sections(
        case elfcpp::SHT_DYNAMIC:
          pi = pdynamic_shndx;
          break;
+       case elfcpp::SHT_SYMTAB_SHNDX:
+         xindex_shndx = i;
+         xindex_link = this->adjust_shndx(shdr.get_sh_link());
+         if (xindex_link == this->dynsym_shndx_)
+           {
+             Xindex* xindex = new Xindex(this->elf_file_.large_shndx_offset());
+             xindex->read_symtab_xindex<size, big_endian>(this, xindex_shndx,
+                                                          pshdrs);
+             this->set_xindex(xindex);
+           }
+         pi = NULL;
+         break;
        default:
          pi = NULL;
          break;
@@ -162,7 +181,7 @@ Sized_dynobj<size, big_endian>::read_dynsym_section(
     elfcpp::SHT type,
     unsigned int link,
     File_view** view,
-    off_t* view_size,
+    section_size_type* view_size,
     unsigned int* view_info)
 {
   if (shndx == -1U)
@@ -177,13 +196,13 @@ Sized_dynobj<size, big_endian>::read_dynsym_section(
 
   gold_assert(shdr.get_sh_type() == type);
 
-  if (shdr.get_sh_link() != link)
+  if (this->adjust_shndx(shdr.get_sh_link()) != link)
     this->error(_("unexpected link in section %u header: %u != %u"),
-               shndx, shdr.get_sh_link(), link);
+               shndx, this->adjust_shndx(shdr.get_sh_link()), link);
 
   *view = this->get_lasting_view(shdr.get_sh_offset(), shdr.get_sh_size(),
-                                false);
-  *view_size = shdr.get_sh_size();
+                                true, false);
+  *view_size = convert_to_section_size_type(shdr.get_sh_size());
   *view_info = shdr.get_sh_info();
 }
 
@@ -207,9 +226,9 @@ Sized_dynobj<size, big_endian>::read_dynamic(const unsigned char* pshdrs,
 
   const off_t dynamic_size = dynamicshdr.get_sh_size();
   const unsigned char* pdynamic = this->get_view(dynamicshdr.get_sh_offset(),
-                                                dynamic_size, false);
+                                                dynamic_size, true, false);
 
-  const unsigned int link = dynamicshdr.get_sh_link();
+  const unsigned int link = this->adjust_shndx(dynamicshdr.get_sh_link());
   if (link != strtab_shndx)
     {
       if (link >= this->shnum())
@@ -228,7 +247,8 @@ Sized_dynobj<size, big_endian>::read_dynamic(const unsigned char* pshdrs,
        }
 
       strtab_size = strtabshdr.get_sh_size();
-      strtabu = this->get_view(strtabshdr.get_sh_offset(), strtab_size, false);
+      strtabu = this->get_view(strtabshdr.get_sh_offset(), strtab_size, false,
+                              false);
     }
 
   const char* const strtab = reinterpret_cast<const char*>(strtabu);
@@ -289,13 +309,12 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 
   const unsigned char* const pshdrs = sd->section_headers->data();
 
-  unsigned int dynsym_shndx;
   unsigned int versym_shndx;
   unsigned int verdef_shndx;
   unsigned int verneed_shndx;
   unsigned int dynamic_shndx;
-  this->find_dynsym_sections(pshdrs, &dynsym_shndx, &versym_shndx,
-                            &verdef_shndx, &verneed_shndx, &dynamic_shndx);
+  this->find_dynsym_sections(pshdrs, &versym_shndx, &verdef_shndx,
+                            &verneed_shndx, &dynamic_shndx);
 
   unsigned int strtab_shndx = -1U;
 
@@ -304,19 +323,30 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
   sd->external_symbols_offset = 0;
   sd->symbol_names = NULL;
   sd->symbol_names_size = 0;
-
-  if (dynsym_shndx != -1U)
+  sd->versym = NULL;
+  sd->versym_size = 0;
+  sd->verdef = NULL;
+  sd->verdef_size = 0;
+  sd->verdef_info = 0;
+  sd->verneed = NULL;
+  sd->verneed_size = 0;
+  sd->verneed_info = 0;
+
+  if (this->dynsym_shndx_ != -1U)
     {
       // Get the dynamic symbols.
-      typename This::Shdr dynsymshdr(pshdrs + dynsym_shndx * This::shdr_size);
+      typename This::Shdr dynsymshdr(pshdrs
+                                    + this->dynsym_shndx_ * This::shdr_size);
       gold_assert(dynsymshdr.get_sh_type() == elfcpp::SHT_DYNSYM);
 
       sd->symbols = this->get_lasting_view(dynsymshdr.get_sh_offset(),
-                                          dynsymshdr.get_sh_size(), false);
-      sd->symbols_size = dynsymshdr.get_sh_size();
+                                          dynsymshdr.get_sh_size(), true,
+                                          false);
+      sd->symbols_size =
+       convert_to_section_size_type(dynsymshdr.get_sh_size());
 
       // Get the symbol names.
-      strtab_shndx = dynsymshdr.get_sh_link();
+      strtab_shndx = this->adjust_shndx(dynsymshdr.get_sh_link());
       if (strtab_shndx >= this->shnum())
        {
          this->error(_("invalid dynamic symbol table name index: %u"),
@@ -334,15 +364,16 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 
       sd->symbol_names = this->get_lasting_view(strtabshdr.get_sh_offset(),
                                                strtabshdr.get_sh_size(),
-                                               true);
-      sd->symbol_names_size = strtabshdr.get_sh_size();
+                                               false, false);
+      sd->symbol_names_size =
+       convert_to_section_size_type(strtabshdr.get_sh_size());
 
       // Get the version information.
 
       unsigned int dummy;
       this->read_dynsym_section(pshdrs, versym_shndx, elfcpp::SHT_GNU_versym,
-                               dynsym_shndx, &sd->versym, &sd->versym_size,
-                               &dummy);
+                               this->dynsym_shndx_,
+                               &sd->versym, &sd->versym_size, &dummy);
 
       // We require that the version definition and need section link
       // to the same string table as the dynamic symbol table.  This
@@ -370,9 +401,22 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
                       sd->symbol_names_size);
 }
 
+// Return the Xindex structure to use for object with lots of
+// sections.
+
+template<int size, bool big_endian>
+Xindex*
+Sized_dynobj<size, big_endian>::do_initialize_xindex()
+{
+  gold_assert(this->dynsym_shndx_ != -1U);
+  Xindex* xindex = new Xindex(this->elf_file_.large_shndx_offset());
+  xindex->initialize_symtab_xindex<size, big_endian>(this, this->dynsym_shndx_);
+  return xindex;
+}
+
 // Lay out the input sections for a dynamic object.  We don't want to
 // include sections from a dynamic object, so all that we actually do
-// here is check for .gnu.warning sections.
+// here is check for .gnu.warning and .note.GNU-split-stack sections.
 
 template<int size, bool big_endian>
 void
@@ -407,6 +451,7 @@ Sized_dynobj<size, big_endian>::do_layout(Symbol_table* symtab,
       const char* name = pnames + shdr.get_sh_name();
 
       this->handle_gnu_warning_section(name, i, symtab);
+      this->handle_split_stack_section(name);
     }
 
   delete sd->section_headers;
@@ -444,10 +489,10 @@ Sized_dynobj<size, big_endian>::make_verdef_map(
     return;
 
   const char* names = reinterpret_cast<const char*>(sd->symbol_names->data());
-  off_t names_size = sd->symbol_names_size;
+  section_size_type names_size = sd->symbol_names_size;
 
   const unsigned char* pverdef = sd->verdef->data();
-  off_t verdef_size = sd->verdef_size;
+  section_size_type verdef_size = sd->verdef_size;
   const unsigned int count = sd->verdef_info;
 
   const unsigned char* p = pverdef;
@@ -462,7 +507,7 @@ Sized_dynobj<size, big_endian>::make_verdef_map(
          return;
        }
 
-      const unsigned int vd_ndx = verdef.get_vd_ndx();
+      const section_size_type vd_ndx = verdef.get_vd_ndx();
 
       // The GNU linker clears the VERSYM_HIDDEN bit.  I'm not
       // sure why.
@@ -470,36 +515,40 @@ Sized_dynobj<size, big_endian>::make_verdef_map(
       // The first Verdaux holds the name of this version.  Subsequent
       // ones are versions that this one depends upon, which we don't
       // care about here.
-      const unsigned int vd_cnt = verdef.get_vd_cnt();
+      const section_size_type vd_cnt = verdef.get_vd_cnt();
       if (vd_cnt < 1)
        {
-         this->error(_("verdef vd_cnt field too small: %u"), vd_cnt);
+         this->error(_("verdef vd_cnt field too small: %u"),
+                      static_cast<unsigned int>(vd_cnt));
          return;
        }
 
-      const unsigned int vd_aux = verdef.get_vd_aux();
+      const section_size_type vd_aux = verdef.get_vd_aux();
       if ((p - pverdef) + vd_aux >= verdef_size)
        {
-         this->error(_("verdef vd_aux field out of range: %u"), vd_aux);
+         this->error(_("verdef vd_aux field out of range: %u"),
+                      static_cast<unsigned int>(vd_aux));
          return;
        }
 
       const unsigned char* pvda = p + vd_aux;
       elfcpp::Verdaux<size, big_endian> verdaux(pvda);
 
-      const unsigned int vda_name = verdaux.get_vda_name();
+      const section_size_type vda_name = verdaux.get_vda_name();
       if (vda_name >= names_size)
        {
-         this->error(_("verdaux vda_name field out of range: %u"), vda_name);
+         this->error(_("verdaux vda_name field out of range: %u"),
+                      static_cast<unsigned int>(vda_name));
          return;
        }
 
       this->set_version_map(version_map, vd_ndx, names + vda_name);
 
-      const unsigned int vd_next = verdef.get_vd_next();
+      const section_size_type vd_next = verdef.get_vd_next();
       if ((p - pverdef) + vd_next >= verdef_size)
        {
-         this->error(_("verdef vd_next field out of range: %u"), vd_next);
+         this->error(_("verdef vd_next field out of range: %u"),
+                      static_cast<unsigned int>(vd_next));
          return;
        }
 
@@ -519,10 +568,10 @@ Sized_dynobj<size, big_endian>::make_verneed_map(
     return;
 
   const char* names = reinterpret_cast<const char*>(sd->symbol_names->data());
-  off_t names_size = sd->symbol_names_size;
+  section_size_type names_size = sd->symbol_names_size;
 
   const unsigned char* pverneed = sd->verneed->data();
-  const off_t verneed_size = sd->verneed_size;
+  const section_size_type verneed_size = sd->verneed_size;
   const unsigned int count = sd->verneed_info;
 
   const unsigned char* p = pverneed;
@@ -537,11 +586,12 @@ Sized_dynobj<size, big_endian>::make_verneed_map(
          return;
        }
 
-      const unsigned int vn_aux = verneed.get_vn_aux();
+      const section_size_type vn_aux = verneed.get_vn_aux();
 
       if ((p - pverneed) + vn_aux >= verneed_size)
        {
-         this->error(_("verneed vn_aux field out of range: %u"), vn_aux);
+         this->error(_("verneed vn_aux field out of range: %u"),
+                      static_cast<unsigned int>(vn_aux));
          return;
        }
 
@@ -555,28 +605,29 @@ Sized_dynobj<size, big_endian>::make_verneed_map(
          if (vna_name >= names_size)
            {
              this->error(_("vernaux vna_name field out of range: %u"),
-                         vna_name);
+                         static_cast<unsigned int>(vna_name));
              return;
            }
 
          this->set_version_map(version_map, vernaux.get_vna_other(),
                                names + vna_name);
 
-         const unsigned int vna_next = vernaux.get_vna_next();
+         const section_size_type vna_next = vernaux.get_vna_next();
          if ((pvna - pverneed) + vna_next >= verneed_size)
            {
              this->error(_("verneed vna_next field out of range: %u"),
-                         vna_next);
+                         static_cast<unsigned int>(vna_next));
              return;
            }
 
          pvna += vna_next;
        }
 
-      const unsigned int vn_next = verneed.get_vn_next();
+      const section_size_type vn_next = verneed.get_vn_next();
       if ((p - pverneed) + vn_next >= verneed_size)
        {
-         this->error(_("verneed vn_next field out of range: %u"), vn_next);
+         this->error(_("verneed vn_next field out of range: %u"),
+                      static_cast<unsigned int>(vn_next));
          return;
        }
 
@@ -608,7 +659,8 @@ Sized_dynobj<size, big_endian>::make_version_map(
 template<int size, bool big_endian>
 void
 Sized_dynobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
-                                              Read_symbols_data* sd)
+                                              Read_symbols_data* sd,
+                                              Layout*)
 {
   if (sd->symbols == NULL)
     {
@@ -621,7 +673,7 @@ Sized_dynobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
   const int sym_size = This::sym_size;
   const size_t symcount = sd->symbols_size / sym_size;
   gold_assert(sd->external_symbols_offset == 0);
-  if (static_cast<off_t>(symcount * sym_size) != sd->symbols_size)
+  if (symcount * sym_size != sd->symbols_size)
     {
       this->error(_("size of dynamic symbols is not multiple of symbol size"));
       return;
@@ -630,6 +682,14 @@ Sized_dynobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
   Version_map version_map;
   this->make_version_map(sd, &version_map);
 
+  // If printing symbol counts, we want to track symbols.
+  
+  if (parameters->options().user_set_print_symbol_counts())
+    {
+      this->symbols_ = new Symbols();
+      this->symbols_->resize(symcount);
+    }
+
   const char* sym_names =
     reinterpret_cast<const char*>(sd->symbol_names->data());
   symtab->add_from_dynobj(this, sd->symbols->data(), symcount,
@@ -638,7 +698,9 @@ Sized_dynobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
                           ? NULL
                           : sd->versym->data()),
                          sd->versym_size,
-                         &version_map);
+                         &version_map,
+                         this->symbols_,
+                         &this->defined_count_);
 
   delete sd->symbols;
   sd->symbols = NULL;
@@ -659,6 +721,33 @@ Sized_dynobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
       delete sd->verneed;
       sd->verneed = NULL;
     }
+
+  // This is normally the last time we will read any data from this
+  // file.
+  this->clear_view_cache_marks();
+}
+
+// Get symbol counts.
+
+template<int size, bool big_endian>
+void
+Sized_dynobj<size, big_endian>::do_get_global_symbol_counts(
+    const Symbol_table*,
+    size_t* defined,
+    size_t* used) const
+{
+  *defined = this->defined_count_;
+  size_t count = 0;
+  for (typename Symbols::const_iterator p = this->symbols_->begin();
+       p != this->symbols_->end();
+       ++p)
+    if (*p != NULL
+       && (*p)->source() == Symbol::FROM_OBJECT
+       && (*p)->object() == this
+       && (*p)->is_defined()
+       && (*p)->dynsym_index() != -1U)
+      ++count;
+  *used = count;
 }
 
 // Given a vector of hash codes, compute the number of hash buckets to
@@ -674,20 +763,22 @@ Dynobj::compute_bucket_count(const std::vector<uint32_t>& hashcodes,
   // based on the number of symbols there are.  If there are fewer
   // than 3 symbols we use 1 bucket, fewer than 17 symbols we use 3
   // buckets, fewer than 37 we use 17 buckets, and so forth.  We never
-  // use more than 32771 buckets.  This is straight from the old GNU
+  // use more than 262147 buckets.  This is straight from the old GNU
   // linker.
   static const unsigned int buckets[] =
   {
     1, 3, 17, 37, 67, 97, 131, 197, 263, 521, 1031, 2053, 4099, 8209,
-    16411, 32771
+    16411, 32771, 65537, 131101, 262147
   };
   const int buckets_count = sizeof buckets / sizeof buckets[0];
 
   unsigned int symcount = hashcodes.size();
   unsigned int ret = 1;
+  const double full_fraction
+    = 1.0 - parameters->options().hash_bucket_empty_fraction();
   for (int i = 0; i < buckets_count; ++i)
     {
-      if (symcount < buckets[i])
+      if (symcount < buckets[i] * full_fraction)
        break;
       ret = buckets[i];
     }
@@ -762,7 +853,7 @@ Dynobj::create_elf_hash_table(const std::vector<Symbol*>& dynsyms,
                          * 4);
   unsigned char* phash = new unsigned char[hashlen];
 
-  if (parameters->is_big_endian())
+  if (parameters->target().is_big_endian())
     {
 #if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_64_BIG)
       Dynobj::sized_create_elf_hash_table<true>(bucket, chain, phash,
@@ -891,8 +982,8 @@ Dynobj::create_gnu_hash_table(const std::vector<Symbol*>& dynsyms,
 
   // For the actual data generation we call out to a templatized
   // function.
-  int size = parameters->get_size();
-  bool big_endian = parameters->is_big_endian();
+  int size = parameters->target().get_size();
+  bool big_endian = parameters->target().is_big_endian();
   if (size == 32)
     {
       if (big_endian)
@@ -1097,8 +1188,7 @@ Dynobj::sized_create_gnu_hash_table(
 
 template<int size, bool big_endian>
 unsigned char*
-Verdef::write(const Stringpool* dynpool, bool is_last, unsigned char* pb
-              ACCEPT_SIZE_ENDIAN) const
+Verdef::write(const Stringpool* dynpool, bool is_last, unsigned char* pb) const
 {
   const int verdef_size = elfcpp::Elf_sizes<size>::verdef_size;
   const int verdaux_size = elfcpp::Elf_sizes<size>::verdaux_size;
@@ -1177,7 +1267,7 @@ Verneed::finalize(unsigned int index)
 template<int size, bool big_endian>
 unsigned char*
 Verneed::write(const Stringpool* dynpool, bool is_last,
-              unsigned char* pb ACCEPT_SIZE_ENDIAN) const
+              unsigned char* pb) const
 {
   const int verneed_size = elfcpp::Elf_sizes<size>::verneed_size;
   const int vernaux_size = elfcpp::Elf_sizes<size>::vernaux_size;
@@ -1215,6 +1305,37 @@ Verneed::write(const Stringpool* dynpool, bool is_last,
 
 // Versions methods.
 
+Versions::Versions(const Version_script_info& version_script,
+                   Stringpool* dynpool)
+  : defs_(), needs_(), version_table_(),
+    is_finalized_(false), version_script_(version_script),
+    needs_base_version_(parameters->options().shared())
+{
+  if (!this->version_script_.empty())
+    {
+      // Parse the version script, and insert each declared version into
+      // defs_ and version_table_.
+      std::vector<std::string> versions = this->version_script_.get_versions();
+
+      if (this->needs_base_version_ && !versions.empty())
+       this->define_base_version(dynpool);
+
+      for (size_t k = 0; k < versions.size(); ++k)
+        {
+          Stringpool::Key version_key;
+          const char* version = dynpool->add(versions[k].c_str(),
+                                             true, &version_key);
+          Verdef* const vd = new Verdef(
+              version,
+              this->version_script_.get_dependencies(version),
+              false, false, false);
+          this->defs_.push_back(vd);
+          Key key(version_key, 0);
+          this->version_table_.insert(std::make_pair(key, vd));
+        }
+    }
+}
+
 Versions::~Versions()
 {
   for (Defs::iterator p = this->defs_.begin();
@@ -1228,6 +1349,28 @@ Versions::~Versions()
     delete *p;
 }
 
+// Define the base version of a shared library.  The base version definition
+// must be the first entry in defs_.  We insert it lazily so that defs_ is
+// empty if no symbol versioning is used.  Then layout can just drop the
+// version sections.
+
+void
+Versions::define_base_version(Stringpool* dynpool)
+{
+  // If we do any versioning at all,  we always need a base version, so
+  // define that first.  Nothing explicitly declares itself as part of base,
+  // so it doesn't need to be in version_table_.
+  gold_assert(this->defs_.empty());
+  const char* name = parameters->options().soname();
+  if (name == NULL)
+    name = parameters->options().output_file_name();
+  name = dynpool->add(name, false, NULL);
+  Verdef* vdbase = new Verdef(name, std::vector<std::string>(),
+                              true, false, true);
+  this->defs_.push_back(vdbase);
+  this->needs_base_version_ = false;
+}
+
 // Return the dynamic object which a symbol refers to.
 
 Dynobj*
@@ -1259,7 +1402,7 @@ Versions::record_version(const Symbol_table* symtab,
 
   if (!sym->is_from_dynobj() && !sym->is_copied_from_dynobj())
     {
-      if (parameters->output_is_shared())
+      if (parameters->options().shared())
         this->add_def(sym, version, version_key);
     }
   else
@@ -1288,33 +1431,25 @@ Versions::add_def(const Symbol* sym, const char* version,
 
       // We have now seen a symbol in this version, so it is not
       // weak.
+      gold_assert(vb != NULL);
       vb->clear_weak();
-
-      // FIXME: When we support version scripts, we will need to
-      // check whether this symbol should be forced local.
     }
   else
     {
       // If we are creating a shared object, it is an error to
       // find a definition of a symbol with a version which is not
       // in the version script.
-      if (parameters->output_is_shared())
-       {
-         gold_error(_("symbol %s has undefined version %s"),
-                    sym->name(), version);
-         return;
-       }
-
-      // If this is the first version we are defining, first define
-      // the base version.  FIXME: Should use soname here when
-      // creating a shared object.
-      Verdef* vdbase = new Verdef(parameters->output_file_name(), true, false,
-                                 true);
-      this->defs_.push_back(vdbase);
-
+      if (parameters->options().shared())
+       gold_error(_("symbol %s has undefined version %s"),
+                  sym->demangled_name().c_str(), version);
+      else
+       // We only insert a base version for shared library.
+       gold_assert(!this->needs_base_version_);
+       
       // When creating a regular executable, automatically define
       // a new version.
-      Verdef* vd = new Verdef(version, false, false, false);
+      Verdef* vd = new Verdef(version, std::vector<std::string>(),
+                              false, false, false);
       this->defs_.push_back(vd);
       ins.first->second = vd;
     }
@@ -1357,6 +1492,10 @@ Versions::add_need(Stringpool* dynpool, const char* filename, const char* name,
 
   if (vn == NULL)
     {
+      // Create base version definition lazily for shared library.
+      if (this->needs_base_version_)
+       this->define_base_version(dynpool);
+
       // We have a new filename.
       vn = new Verneed(filename);
       this->needs_.push_back(vn);
@@ -1369,8 +1508,8 @@ Versions::add_need(Stringpool* dynpool, const char* filename, const char* name,
 // each new version definition.
 
 unsigned int
-Versions::finalize(const Target* target, Symbol_table* symtab,
-                  unsigned int dynsym_index, std::vector<Symbol*>* syms)
+Versions::finalize(Symbol_table* symtab, unsigned int dynsym_index,
+                  std::vector<Symbol*>* syms)
 {
   gold_assert(!this->is_finalized_);
 
@@ -1386,12 +1525,14 @@ Versions::finalize(const Target* target, Symbol_table* symtab,
       // Create a version symbol if necessary.
       if (!(*p)->is_symbol_created())
        {
-         Symbol* vsym = symtab->define_as_constant(target, (*p)->name(),
-                                                   (*p)->name(), 0, 0,
+         Symbol* vsym = symtab->define_as_constant((*p)->name(),
+                                                   (*p)->name(),
+                                                   Symbol_table::PREDEFINED,
+                                                   0, 0,
                                                    elfcpp::STT_OBJECT,
                                                    elfcpp::STB_GLOBAL,
                                                    elfcpp::STV_DEFAULT, 0,
-                                                   false);
+                                                   false, false);
          vsym->set_needs_dynsym_entry();
           vsym->set_dynsym_index(dynsym_index);
          ++dynsym_index;
@@ -1435,7 +1576,7 @@ Versions::version_index(const Symbol_table* symtab, const Stringpool* dynpool,
   Key k;
   if (!sym->is_from_dynobj() && !sym->is_copied_from_dynobj())
     {
-      if (!parameters->output_is_shared())
+      if (!parameters->options().shared())
         return elfcpp::VER_NDX_GLOBAL;
       k = Key(version_key, 0);
     }
@@ -1466,8 +1607,7 @@ Versions::symbol_section_contents(const Symbol_table* symtab,
                                  unsigned int local_symcount,
                                  const std::vector<Symbol*>& syms,
                                  unsigned char** pp,
-                                 unsigned int* psize
-                                  ACCEPT_SIZE_ENDIAN) const
+                                 unsigned int* psize) const
 {
   gold_assert(this->is_finalized_);
 
@@ -1486,10 +1626,14 @@ Versions::symbol_section_contents(const Symbol_table* symtab,
       const char* version = (*p)->version();
       if (version == NULL)
        version_index = elfcpp::VER_NDX_GLOBAL;
-      else
+      else        
        version_index = this->version_index(symtab, dynpool, *p);
+      // If the symbol was defined as foo@V1 instead of foo@@V1, add
+      // the hidden bit.
+      if ((*p)->version() != NULL && !(*p)->is_default())
+        version_index |= elfcpp::VERSYM_HIDDEN;
       elfcpp::Swap<16, big_endian>::writeval(pbuf + (*p)->dynsym_index() * 2,
-                                            version_index);
+                                             version_index);
     }
 
   *pp = pbuf;
@@ -1503,8 +1647,7 @@ template<int size, bool big_endian>
 void
 Versions::def_section_contents(const Stringpool* dynpool,
                               unsigned char** pp, unsigned int* psize,
-                              unsigned int* pentries
-                               ACCEPT_SIZE_ENDIAN) const
+                              unsigned int* pentries) const
 {
   gold_assert(this->is_finalized_);
   gold_assert(!this->defs_.empty());
@@ -1529,9 +1672,9 @@ Versions::def_section_contents(const Stringpool* dynpool,
   for (p = this->defs_.begin(), i = 0;
        p != this->defs_.end();
        ++p, ++i)
-    pb = (*p)->write SELECT_SIZE_ENDIAN_NAME(size, big_endian)(
-            dynpool, i + 1 >= this->defs_.size(), pb
-            SELECT_SIZE_ENDIAN(size, big_endian));
+    pb = (*p)->write<size, big_endian>(dynpool,
+                                      i + 1 >= this->defs_.size(),
+                                      pb);
 
   gold_assert(static_cast<unsigned int>(pb - pbuf) == sz);
 
@@ -1547,8 +1690,7 @@ template<int size, bool big_endian>
 void
 Versions::need_section_contents(const Stringpool* dynpool,
                                unsigned char** pp, unsigned int *psize,
-                               unsigned int *pentries
-                                ACCEPT_SIZE_ENDIAN) const
+                               unsigned int *pentries) const
 {
   gold_assert(this->is_finalized_);
   gold_assert(!this->needs_.empty());
@@ -1573,9 +1715,9 @@ Versions::need_section_contents(const Stringpool* dynpool,
   for (p = this->needs_.begin(), i = 0;
        p != this->needs_.end();
        ++p, ++i)
-    pb = (*p)->write SELECT_SIZE_ENDIAN_NAME(size, big_endian)(
-           dynpool, i + 1 >= this->needs_.size(), pb
-            SELECT_SIZE_ENDIAN(size, big_endian));
+    pb = (*p)->write<size, big_endian>(dynpool,
+                                      i + 1 >= this->needs_.size(),
+                                      pb);
 
   gold_assert(static_cast<unsigned int>(pb - pbuf) == sz);
 
@@ -1616,8 +1758,7 @@ Versions::symbol_section_contents<32, false>(
     unsigned int,
     const std::vector<Symbol*>&,
     unsigned char**,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(32, false)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_32_BIG
@@ -1629,8 +1770,7 @@ Versions::symbol_section_contents<32, true>(
     unsigned int,
     const std::vector<Symbol*>&,
     unsigned char**,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(32, true)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_64_LITTLE
@@ -1642,8 +1782,7 @@ Versions::symbol_section_contents<64, false>(
     unsigned int,
     const std::vector<Symbol*>&,
     unsigned char**,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(64, false)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_64_BIG
@@ -1655,8 +1794,7 @@ Versions::symbol_section_contents<64, true>(
     unsigned int,
     const std::vector<Symbol*>&,
     unsigned char**,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(64, true)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_32_LITTLE
@@ -1666,8 +1804,7 @@ Versions::def_section_contents<32, false>(
     const Stringpool*,
     unsigned char**,
     unsigned int*,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(32, false)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_32_BIG
@@ -1677,8 +1814,7 @@ Versions::def_section_contents<32, true>(
     const Stringpool*,
     unsigned char**,
     unsigned int*,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(32, true)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_64_LITTLE
@@ -1688,8 +1824,7 @@ Versions::def_section_contents<64, false>(
     const Stringpool*,
     unsigned char**,
     unsigned int*,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(64, false)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_64_BIG
@@ -1699,8 +1834,7 @@ Versions::def_section_contents<64, true>(
     const Stringpool*,
     unsigned char**,
     unsigned int*,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(64, true)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_32_LITTLE
@@ -1710,8 +1844,7 @@ Versions::need_section_contents<32, false>(
     const Stringpool*,
     unsigned char**,
     unsigned int*,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(32, false)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_32_BIG
@@ -1721,8 +1854,7 @@ Versions::need_section_contents<32, true>(
     const Stringpool*,
     unsigned char**,
     unsigned int*,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(32, true)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_64_LITTLE
@@ -1732,8 +1864,7 @@ Versions::need_section_contents<64, false>(
     const Stringpool*,
     unsigned char**,
     unsigned int*,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(64, false)) const;
+    unsigned int*) const;
 #endif
 
 #ifdef HAVE_TARGET_64_BIG
@@ -1743,8 +1874,7 @@ Versions::need_section_contents<64, true>(
     const Stringpool*,
     unsigned char**,
     unsigned int*,
-    unsigned int*
-    ACCEPT_SIZE_ENDIAN_EXPLICIT(64, true)) const;
+    unsigned int*) const;
 #endif
 
 } // End namespace gold.