Add -Wshadow to the gcc command line options used when compiling the binutils.

[platform/upstream/binutils.git] / gold / dynobj.h

diff --git a/gold/dynobj.h b/gold/dynobj.h
index b5b9bd9..be0d975 100644 (file)
--- a/gold/dynobj.h
+++ b/gold/dynobj.h
@@ -161,9 +161,9 @@ class Sized_dynobj : public Dynobj
   Sized_dynobj(const std::string& name, Input_file* input_file, off_t offset,
               const typename elfcpp::Ehdr<size, big_endian>&);
 
-  // Set up the object file based on the ELF header.
+  // Set up the object file based on TARGET.
   void
-  setup(const typename elfcpp::Ehdr<size, big_endian>&);
+  setup();
 
   // Read the symbols.
   void
@@ -175,7 +175,7 @@ class Sized_dynobj : public Dynobj
 
   // Add the symbols to the symbol table.
   void
-  do_add_symbols(Symbol_table*, Read_symbols_data*);
+  do_add_symbols(Symbol_table*, Read_symbols_data*, Layout*);
 
   // Get the size of a section.
   uint64_t
@@ -198,6 +198,11 @@ class Sized_dynobj : public Dynobj
   do_section_flags(unsigned int shndx)
   { return this->elf_file_.section_flags(shndx); }
 
+  // Not used for dynobj.
+  uint64_t
+  do_section_entsize(unsigned int )
+  { gold_unreachable(); }
+
   // Return section address.
   uint64_t
   do_section_address(unsigned int shndx)
@@ -325,10 +330,10 @@ class Version_base
 
   // Set the version index.
   void
-  set_index(unsigned int index)
+  set_index(unsigned int vindex)
   {
     gold_assert(this->index_ == -1U);
-    this->index_ = index;
+    this->index_ = vindex;
   }
 
   // Clear the weak flag in a version definition.
@@ -349,10 +354,10 @@ class Version_base
 class Verdef : public Version_base
 {
  public:
-  Verdef(const char* name, const std::vector<std::string>& deps,
-         bool is_base, bool is_weak, bool is_symbol_created)
-    : name_(name), deps_(deps), is_base_(is_base), is_weak_(is_weak),
-      is_symbol_created_(is_symbol_created)
+  Verdef(const char* vname, const std::vector<std::string>& deps,
+         bool is_base, bool vis_weak, bool vis_symbol_created)
+    : name_(vname), deps_(deps), is_base_(is_base), is_weak_(vis_weak),
+      is_symbol_created_(vis_symbol_created)
   { }
 
   // Return the version name.
@@ -368,8 +373,8 @@ class Verdef : public Version_base
   // Add a dependency to this version.  The NAME should be
   // canonicalized in the dynamic Stringpool.
   void
-  add_dependency(const char* name)
-  { this->deps_.push_back(name); }
+  add_dependency(const char* dname)
+  { this->deps_.push_back(dname); }
 
   // Return whether this definition is weak.
   bool
@@ -419,8 +424,8 @@ class Verdef : public Version_base
 class Verneed_version : public Version_base
 {
  public:
-  Verneed_version(const char* version)
-    : version_(version)
+  Verneed_version(const char* ver)
+    : version_(ver)
   { }
 
   // Return the version name.
@@ -445,8 +450,8 @@ class Verneed_version : public Version_base
 class Verneed
 {
  public:
-  Verneed(const char* filename)
-    : filename_(filename), need_versions_()
+  Verneed(const char* fname)
+    : filename_(fname), need_versions_()
   { }
 
   ~Verneed();
@@ -579,6 +584,10 @@ class Versions
   version_index(const Symbol_table*, const Stringpool*,
                const Symbol* sym) const;
 
+  // Define the base version of a shared library.
+  void
+  define_base_version(Stringpool* dynpool);
+
   // We keep a hash table mapping canonicalized name/version pairs to
   // a version base.
   typedef std::pair<Stringpool::Key, Stringpool::Key> Key;
@@ -611,6 +620,9 @@ class Versions
   bool is_finalized_;
   // Contents of --version-script, if passed, or NULL.
   const Version_script_info& version_script_;
+  // Whether we need to insert a base version.  This is only used for
+  // shared libaries and is cleared when the base version is defined.
+  bool needs_base_version_;
 };
 
 } // End namespace gold.