X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gold%2Fdynobj.cc;h=b6868675df77655433816212cdbff07291d12184;hb=9531704395070a7d130320a065cef6bab6c28b9d;hp=09e71263ac8f2200ef665af8968757f1fd476191;hpb=9025d29d14ae287d2bc338ef1b0bfa043799e15c;p=binutils-gdb.git

diff --git a/gold/dynobj.cc b/gold/dynobj.cc
index 09e71263ac8..b6868675df7 100644
--- a/gold/dynobj.cc
+++ b/gold/dynobj.cc
@@ -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"
 
@@ -35,14 +36,31 @@ namespace gold
 
 // Class Dynobj.
 
-// Return the string to use in a DT_NEEDED entry.
+// Sets up the default soname_ to use, in the (rare) cases we never
+// see a DT_SONAME entry.
 
-const char*
-Dynobj::soname() const
+Dynobj::Dynobj(const std::string& name, Input_file* input_file, off_t offset)
+  : Object(name, input_file, true, offset),
+    needed_(),
+    unknown_needed_(UNKNOWN_NEEDED_UNSET)
 {
-  if (!this->soname_.empty())
-    return this->soname_.c_str();
-  return this->name().c_str();
+  // This will be overridden by a DT_SONAME entry, hopefully.  But if
+  // we never see a DT_SONAME entry, our rule is to use the dynamic
+  // object's filename.  The only exception is when the dynamic object
+  // is part of an archive (so the filename is the archive's
+  // filename).  In that case, we use just the dynobj's name-in-archive.
+  this->soname_ = this->input_file()->found_name();
+  if (this->offset() != 0)
+    {
+      std::string::size_type open_paren = this->name().find('(');
+      std::string::size_type close_paren = this->name().find(')');
+      if (open_paren != std::string::npos && close_paren != std::string::npos)
+	{
+	  // It's an archive, and name() is of the form 'foo.a(bar.so)'.
+	  this->soname_ = this->name().substr(open_paren + 1,
+					      close_paren - (open_paren + 1));
+	}
+    }
 }
 
 // Class Sized_dynobj.
@@ -125,13 +143,8 @@ Sized_dynobj<size, big_endian>::find_dynsym_sections(
 	continue;
 
       if (*pi != -1U)
-	{
-	  fprintf(stderr,
-		  _("%s: %s: unexpected duplicate type %u section: %u, %u\n"),
-		  program_name, this->name().c_str(), shdr.get_sh_type(),
-		  *pi, i);
-	  gold_exit(false);
-	}
+	this->error(_("unexpected duplicate type %u section: %u, %u"),
+		    shdr.get_sh_type(), *pi, i);
 
       *pi = i;
     }
@@ -150,7 +163,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)
@@ -166,33 +179,29 @@ Sized_dynobj<size, big_endian>::read_dynsym_section(
   gold_assert(shdr.get_sh_type() == type);
 
   if (shdr.get_sh_link() != link)
-    {
-      fprintf(stderr,
-	      _("%s: %s: unexpected link in section %u header: %u != %u\n"),
-	      program_name, this->name().c_str(), shndx,
-	      shdr.get_sh_link(), link);
-      gold_exit(false);
-    }
+    this->error(_("unexpected link in section %u header: %u != %u"),
+	        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();
+  *view_size = convert_to_section_size_type(shdr.get_sh_size());
   *view_info = shdr.get_sh_info();
 }
 
-// Set the soname field if this shared object has a DT_SONAME tag.
-// PSHDRS points to the section headers.  DYNAMIC_SHNDX is the section
-// index of the SHT_DYNAMIC section.  STRTAB_SHNDX, STRTAB, and
-// STRTAB_SIZE are the section index and contents of a string table
-// which may be the one associated with the SHT_DYNAMIC section.
+// Read the dynamic tags.  Set the soname field if this shared object
+// has a DT_SONAME tag.  Record the DT_NEEDED tags.  PSHDRS points to
+// the section headers.  DYNAMIC_SHNDX is the section index of the
+// SHT_DYNAMIC section.  STRTAB_SHNDX, STRTAB, and STRTAB_SIZE are the
+// section index and contents of a string table which may be the one
+// associated with the SHT_DYNAMIC section.
 
 template<int size, bool big_endian>
 void
-Sized_dynobj<size, big_endian>::set_soname(const unsigned char* pshdrs,
-					   unsigned int dynamic_shndx,
-					   unsigned int strtab_shndx,
-					   const unsigned char* strtabu,
-					   off_t strtab_size)
+Sized_dynobj<size, big_endian>::read_dynamic(const unsigned char* pshdrs,
+					     unsigned int dynamic_shndx,
+					     unsigned int strtab_shndx,
+					     const unsigned char* strtabu,
+					     off_t strtab_size)
 {
   typename This::Shdr dynamicshdr(pshdrs + dynamic_shndx * This::shdr_size);
   gold_assert(dynamicshdr.get_sh_type() == elfcpp::SHT_DYNAMIC);
@@ -206,59 +215,68 @@ Sized_dynobj<size, big_endian>::set_soname(const unsigned char* pshdrs,
     {
       if (link >= this->shnum())
 	{
-	  fprintf(stderr,
-		  _("%s: %s: DYNAMIC section %u link out of range: %u\n"),
-		  program_name, this->name().c_str(),
-		  dynamic_shndx, link);
-	  gold_exit(false);
+	  this->error(_("DYNAMIC section %u link out of range: %u"),
+		      dynamic_shndx, link);
+	  return;
 	}
 
       typename This::Shdr strtabshdr(pshdrs + link * This::shdr_size);
       if (strtabshdr.get_sh_type() != elfcpp::SHT_STRTAB)
 	{
-	  fprintf(stderr,
-		  _("%s: %s: DYNAMIC section %u link %u is not a strtab\n"),
-		  program_name, this->name().c_str(),
-		  dynamic_shndx, link);
-	  gold_exit(false);
+	  this->error(_("DYNAMIC section %u link %u is not a strtab"),
+		      dynamic_shndx, link);
+	  return;
 	}
 
       strtab_size = strtabshdr.get_sh_size();
       strtabu = this->get_view(strtabshdr.get_sh_offset(), strtab_size, false);
     }
 
+  const char* const strtab = reinterpret_cast<const char*>(strtabu);
+
   for (const unsigned char* p = pdynamic;
        p < pdynamic + dynamic_size;
        p += This::dyn_size)
     {
       typename This::Dyn dyn(p);
 
-      if (dyn.get_d_tag() == elfcpp::DT_SONAME)
+      switch (dyn.get_d_tag())
 	{
-	  off_t val = dyn.get_d_val();
-	  if (val >= strtab_size)
-	    {
-	      fprintf(stderr,
-		      _("%s: %s: DT_SONAME value out of range: "
-			"%lld >= %lld\n"),
-		      program_name, this->name().c_str(),
-		      static_cast<long long>(val),
-		      static_cast<long long>(strtab_size));
-	      gold_exit(false);
-	    }
-
-	  const char* strtab = reinterpret_cast<const char*>(strtabu);
-	  this->set_soname_string(strtab + val);
+	case elfcpp::DT_NULL:
+	  // We should always see DT_NULL at the end of the dynamic
+	  // tags.
 	  return;
-	}
 
-      if (dyn.get_d_tag() == elfcpp::DT_NULL)
-	return;
+	case elfcpp::DT_SONAME:
+	  {
+	    off_t val = dyn.get_d_val();
+	    if (val >= strtab_size)
+	      this->error(_("DT_SONAME value out of range: %lld >= %lld"),
+			  static_cast<long long>(val),
+			  static_cast<long long>(strtab_size));
+	    else
+	      this->set_soname_string(strtab + val);
+	  }
+	  break;
+
+	case elfcpp::DT_NEEDED:
+	  {
+	    off_t val = dyn.get_d_val();
+	    if (val >= strtab_size)
+	      this->error(_("DT_NEEDED value out of range: %lld >= %lld"),
+			  static_cast<long long>(val),
+			  static_cast<long long>(strtab_size));
+	    else
+	      this->add_needed(strtab + val);
+	  }
+	  break;
+
+	default:
+	  break;
+	}
     }
 
-  fprintf(stderr, _("%s: %s: missing DT_NULL in dynamic segment\n"),
-	  program_name, this->name().c_str());
-  gold_exit(false);
+  this->error(_("missing DT_NULL in dynamic segment"));
 }
 
 // Read the symbols and sections from a dynamic object.  We read the
@@ -282,14 +300,13 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 
   unsigned int strtab_shndx = -1U;
 
-  if (dynsym_shndx == -1U)
-    {
-      sd->symbols = NULL;
-      sd->symbols_size = 0;
-      sd->symbol_names = NULL;
-      sd->symbol_names_size = 0;
-    }
-  else
+  sd->symbols = NULL;
+  sd->symbols_size = 0;
+  sd->external_symbols_offset = 0;
+  sd->symbol_names = NULL;
+  sd->symbol_names_size = 0;
+
+  if (dynsym_shndx != -1U)
     {
       // Get the dynamic symbols.
       typename This::Shdr dynsymshdr(pshdrs + dynsym_shndx * This::shdr_size);
@@ -297,32 +314,31 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 
       sd->symbols = this->get_lasting_view(dynsymshdr.get_sh_offset(),
 					   dynsymshdr.get_sh_size(), false);
-      sd->symbols_size = dynsymshdr.get_sh_size();
+      sd->symbols_size =
+	convert_to_section_size_type(dynsymshdr.get_sh_size());
 
       // Get the symbol names.
       strtab_shndx = dynsymshdr.get_sh_link();
       if (strtab_shndx >= this->shnum())
 	{
-	  fprintf(stderr,
-		  _("%s: %s: invalid dynamic symbol table name index: %u\n"),
-		  program_name, this->name().c_str(), strtab_shndx);
-	  gold_exit(false);
+	  this->error(_("invalid dynamic symbol table name index: %u"),
+		      strtab_shndx);
+	  return;
 	}
       typename This::Shdr strtabshdr(pshdrs + strtab_shndx * This::shdr_size);
       if (strtabshdr.get_sh_type() != elfcpp::SHT_STRTAB)
 	{
-	  fprintf(stderr,
-		  _("%s: %s: dynamic symbol table name section "
-		    "has wrong type: %u\n"),
-		  program_name, this->name().c_str(),
-		  static_cast<unsigned int>(strtabshdr.get_sh_type()));
-	  gold_exit(false);
+	  this->error(_("dynamic symbol table name section "
+			"has wrong type: %u"),
+		      static_cast<unsigned int>(strtabshdr.get_sh_type()));
+	  return;
 	}
 
       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);
+      sd->symbol_names_size =
+	convert_to_section_size_type(strtabshdr.get_sh_size());
 
       // Get the version information.
 
@@ -346,15 +362,15 @@ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
     }
 
   // Read the SHT_DYNAMIC section to find whether this shared object
-  // has a DT_SONAME tag.  This doesn't really have anything to do
-  // with reading the symbols, but this is a convenient place to do
-  // it.
+  // has a DT_SONAME tag and to record any DT_NEEDED tags.  This
+  // doesn't really have anything to do with reading the symbols, but
+  // this is a convenient place to do it.
   if (dynamic_shndx != -1U)
-    this->set_soname(pshdrs, dynamic_shndx, strtab_shndx,
-		     (sd->symbol_names == NULL
-		      ? NULL
-		      : sd->symbol_names->data()),
-		     sd->symbol_names_size);
+    this->read_dynamic(pshdrs, dynamic_shndx, strtab_shndx,
+		       (sd->symbol_names == NULL
+			? NULL
+			: sd->symbol_names->data()),
+		       sd->symbol_names_size);
 }
 
 // Lay out the input sections for a dynamic object.  We don't want to
@@ -386,11 +402,9 @@ Sized_dynobj<size, big_endian>::do_layout(Symbol_table* symtab,
 
       if (shdr.get_sh_name() >= sd->section_names_size)
 	{
-	  fprintf(stderr,
-		  _("%s: %s: bad section name offset for section %u: %lu\n"),
-		  program_name, this->name().c_str(), i,
-		  static_cast<unsigned long>(shdr.get_sh_name()));
-	  gold_exit(false);
+	  this->error(_("bad section name offset for section %u: %lu"),
+		      i, static_cast<unsigned long>(shdr.get_sh_name()));
+	  return;
 	}
 
       const char* name = pnames + shdr.get_sh_name();
@@ -417,11 +431,7 @@ Sized_dynobj<size, big_endian>::set_version_map(
   if (ndx >= version_map->size())
     version_map->resize(ndx + 1);
   if ((*version_map)[ndx] != NULL)
-    {
-      fprintf(stderr, _("%s: %s: duplicate definition for version %u\n"),
-	      program_name, this->name().c_str(), ndx);
-      gold_exit(false);
-    }
+    this->error(_("duplicate definition for version %u"), ndx);
   (*version_map)[ndx] = name;
 }
 
@@ -437,10 +447,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;
@@ -450,12 +460,12 @@ Sized_dynobj<size, big_endian>::make_verdef_map(
 
       if (verdef.get_vd_version() != elfcpp::VER_DEF_CURRENT)
 	{
-	  fprintf(stderr, _("%s: %s: unexpected verdef version %u\n"),
-		  program_name, this->name().c_str(), verdef.get_vd_version());
-	  gold_exit(false);
+	  this->error(_("unexpected verdef version %u"),
+		      verdef.get_vd_version());
+	  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.
@@ -463,44 +473,41 @@ 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)
 	{
-	  fprintf(stderr, _("%s: %s: verdef vd_cnt field too small: %u\n"),
-		  program_name, this->name().c_str(), vd_cnt);
-	  gold_exit(false);
+	  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)
 	{
-	  fprintf(stderr,
-		  _("%s: %s: verdef vd_aux field out of range: %u\n"),
-		  program_name, this->name().c_str(), vd_aux);
-	  gold_exit(false);
+	  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)
 	{
-	  fprintf(stderr,
-		  _("%s: %s: verdaux vda_name field out of range: %u\n"),
-		  program_name, this->name().c_str(), vda_name);
-	  gold_exit(false);
+	  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)
 	{
-	  fprintf(stderr,
-		  _("%s: %s: verdef vd_next field out of range: %u\n"),
-		  program_name, this->name().c_str(), vd_next);
-	  gold_exit(false);
+	  this->error(_("verdef vd_next field out of range: %u"),
+                      static_cast<unsigned int>(vd_next));
+	  return;
 	}
 
       p += vd_next;
@@ -519,10 +526,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;
@@ -532,20 +539,18 @@ Sized_dynobj<size, big_endian>::make_verneed_map(
 
       if (verneed.get_vn_version() != elfcpp::VER_NEED_CURRENT)
 	{
-	  fprintf(stderr, _("%s: %s: unexpected verneed version %u\n"),
-		  program_name, this->name().c_str(),
-		  verneed.get_vn_version());
-	  gold_exit(false);
+	  this->error(_("unexpected verneed version %u"),
+		      verneed.get_vn_version());
+	  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)
 	{
-	  fprintf(stderr,
-		  _("%s: %s: verneed vn_aux field out of range: %u\n"),
-		  program_name, this->name().c_str(), vn_aux);
-	  gold_exit(false);
+	  this->error(_("verneed vn_aux field out of range: %u"),
+                      static_cast<unsigned int>(vn_aux));
+	  return;
 	}
 
       const unsigned int vn_cnt = verneed.get_vn_cnt();
@@ -557,36 +562,31 @@ Sized_dynobj<size, big_endian>::make_verneed_map(
 	  const unsigned int vna_name = vernaux.get_vna_name();
 	  if (vna_name >= names_size)
 	    {
-	      fprintf(stderr,
-		      _("%s: %s: vernaux vna_name field "
-			"out of range: %u\n"),
-		      program_name, this->name().c_str(), vna_name);
-	      gold_exit(false);
+	      this->error(_("vernaux vna_name field out of range: %u"),
+			  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)
 	    {
-	      fprintf(stderr,
-		      _("%s: %s: verneed vna_next field "
-			"out of range: %u\n"),
-		      program_name, this->name().c_str(), vna_next);
-	      gold_exit(false);
+	      this->error(_("verneed vna_next field out of range: %u"),
+			  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)
 	{
-	  fprintf(stderr,
-		  _("%s: %s: verneed vn_next field out of range: %u\n"),
-		  program_name, this->name().c_str(), vn_next);
-	  gold_exit(false);
+	  this->error(_("verneed vn_next field out of range: %u"),
+                      static_cast<unsigned int>(vn_next));
+	  return;
 	}
 
       p += vn_next;
@@ -629,13 +629,11 @@ 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 (symcount * sym_size != sd->symbols_size)
     {
-      fprintf(stderr,
-	      _("%s: %s: size of dynamic symbols is not "
-		"multiple of symbol size\n"),
-	      program_name, this->name().c_str());
-      gold_exit(false);
+      this->error(_("size of dynamic symbols is not multiple of symbol size"));
+      return;
     }
 
   Version_map version_map;
@@ -670,6 +668,10 @@ 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();
 }
 
 // Given a vector of hash codes, compute the number of hash buckets to
@@ -685,20 +687,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];
     }
@@ -773,7 +777,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,
@@ -902,8 +906,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)
@@ -1108,8 +1112,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;
@@ -1188,7 +1191,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;
@@ -1226,6 +1229,47 @@ 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)
+{
+  // 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_.
+  // FIXME: Should use soname here when creating a shared object. Is
+  // this fixme still valid? It looks like it's doing the right thing
+  // to me.
+  if (parameters->options().shared())
+    {
+      const char* name = dynpool->add(parameters->options().output_file_name(),
+                                      false, NULL);
+      Verdef* vdbase = new Verdef(name, std::vector<std::string>(),
+                                  true, false, true);
+      this->defs_.push_back(vdbase);
+    }
+
+  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();
+      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();
@@ -1239,32 +1283,44 @@ Versions::~Versions()
     delete *p;
 }
 
+// Return the dynamic object which a symbol refers to.
+
+Dynobj*
+Versions::get_dynobj_for_sym(const Symbol_table* symtab,
+			     const Symbol* sym) const
+{
+  if (sym->is_copied_from_dynobj())
+    return symtab->get_copy_source(sym);
+  else
+    {
+      Object* object = sym->object();
+      gold_assert(object->is_dynamic());
+      return static_cast<Dynobj*>(object);
+    }
+}
+
 // Record version information for a symbol going into the dynamic
 // symbol table.
 
 void
-Versions::record_version(const General_options* options,
+Versions::record_version(const Symbol_table* symtab,
 			 Stringpool* dynpool, const Symbol* sym)
 {
   gold_assert(!this->is_finalized_);
   gold_assert(sym->version() != NULL);
 
   Stringpool::Key version_key;
-  const char* version = dynpool->add(sym->version(), &version_key);
+  const char* version = dynpool->add(sym->version(), false, &version_key);
 
-  if (!sym->is_from_dynobj())
+  if (!sym->is_from_dynobj() && !sym->is_copied_from_dynobj())
     {
-      if (parameters->output_is_shared())
-        this->add_def(options, sym, version, version_key);
+      if (parameters->options().shared())
+        this->add_def(sym, version, version_key);
     }
   else
     {
       // This is a version reference.
-
-      Object* object = sym->object();
-      gold_assert(object->is_dynamic());
-      Dynobj* dynobj = static_cast<Dynobj*>(object);
-
+      Dynobj* dynobj = this->get_dynobj_for_sym(symtab, sym);
       this->add_need(dynpool, dynobj->soname(), version, version_key);
     }
 }
@@ -1272,8 +1328,8 @@ Versions::record_version(const General_options* options,
 // We've found a symbol SYM defined in version VERSION.
 
 void
-Versions::add_def(const General_options* options, const Symbol* sym,
-		  const char* version, Stringpool::Key version_key)
+Versions::add_def(const Symbol* sym, const char* version,
+		  Stringpool::Key version_key)
 {
   Key k(version_key, 0);
   Version_base* const vbnull = NULL;
@@ -1287,33 +1343,25 @@ Versions::add_def(const General_options* options, const Symbol* sym,
 
       // 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())
+      if (parameters->options().shared())
 	{
-	  fprintf(stderr, _("%s: symbol %s has undefined version %s\n"),
-		  program_name, sym->name(), version);
-	  gold_exit(false);
+	  gold_error(_("symbol %s has undefined version %s"),
+		     sym->demangled_name().c_str(), 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(options->output_file_name(), true, false,
-				  true);
-      this->defs_.push_back(vdbase);
-
       // 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;
     }
@@ -1326,7 +1374,7 @@ Versions::add_need(Stringpool* dynpool, const char* filename, const char* name,
 		   Stringpool::Key name_key)
 {
   Stringpool::Key filename_key;
-  filename = dynpool->add(filename, &filename_key);
+  filename = dynpool->add(filename, true, &filename_key);
 
   Key k(name_key, filename_key);
   Version_base* const vbnull = NULL;
@@ -1368,8 +1416,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_);
 
@@ -1385,12 +1433,12 @@ 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(),
+	  Symbol* vsym = symtab->define_as_constant((*p)->name(),
 						    (*p)->name(), 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;
@@ -1424,24 +1472,23 @@ Versions::finalize(const Target* target, Symbol_table* symtab,
 // pointers.
 
 unsigned int
-Versions::version_index(const Stringpool* dynpool, const Symbol* sym) const
+Versions::version_index(const Symbol_table* symtab, const Stringpool* dynpool,
+			const Symbol* sym) const
 {
   Stringpool::Key version_key;
   const char* version = dynpool->find(sym->version(), &version_key);
   gold_assert(version != NULL);
 
   Key k;
-  if (!sym->is_from_dynobj())
+  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);
     }
   else
     {
-      Object* object = sym->object();
-      gold_assert(object->is_dynamic());
-      Dynobj* dynobj = static_cast<Dynobj*>(object);
+      Dynobj* dynobj = this->get_dynobj_for_sym(symtab, sym);
 
       Stringpool::Key filename_key;
       const char* filename = dynpool->find(dynobj->soname(), &filename_key);
@@ -1461,12 +1508,12 @@ Versions::version_index(const Stringpool* dynpool, const Symbol* sym) const
 
 template<int size, bool big_endian>
 void
-Versions::symbol_section_contents(const Stringpool* dynpool,
+Versions::symbol_section_contents(const Symbol_table* symtab,
+				  const Stringpool* dynpool,
 				  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_);
 
@@ -1485,10 +1532,14 @@ Versions::symbol_section_contents(const Stringpool* dynpool,
       const char* version = (*p)->version();
       if (version == NULL)
 	version_index = elfcpp::VER_NDX_GLOBAL;
-      else
-	version_index = this->version_index(dynpool, *p);
+      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;
@@ -1502,8 +1553,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());
@@ -1528,9 +1578,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);
 
@@ -1546,8 +1596,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());
@@ -1572,9 +1621,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);
 
@@ -1610,48 +1659,48 @@ class Sized_dynobj<64, true>;
 template
 void
 Versions::symbol_section_contents<32, false>(
+    const Symbol_table*,
     const Stringpool*,
     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
 template
 void
 Versions::symbol_section_contents<32, true>(
+    const Symbol_table*,
     const Stringpool*,
     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
 template
 void
 Versions::symbol_section_contents<64, false>(
+    const Symbol_table*,
     const Stringpool*,
     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
 template
 void
 Versions::symbol_section_contents<64, true>(
+    const Symbol_table*,
     const Stringpool*,
     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
@@ -1661,8 +1710,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
@@ -1672,8 +1720,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
@@ -1683,8 +1730,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
@@ -1694,8 +1740,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
@@ -1705,8 +1750,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
@@ -1716,8 +1760,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
@@ -1727,8 +1770,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
@@ -1738,8 +1780,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.