* stringpool.cc (Stringpool_template::reserve): Add

[deliverable/binutils-gdb.git] / gold / plugin.h

diff --git a/gold/plugin.h b/gold/plugin.h
index 8f1db67d288d247d1587b3af3efd9a4ef35aa3eb..e4289ff60e452dc2928685942022e723d6295580 100644 (file)
--- a/gold/plugin.h
+++ b/gold/plugin.h
@@ -1,6 +1,6 @@
 // plugin.h -- plugin manager for gold      -*- C++ -*-
 
-// Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
 // Written by Cary Coutant <ccoutant@google.com>.
 
 // This file is part of gold.
@@ -243,7 +243,7 @@ class Plugin_manager
   // and we are still in the initial input phase.
   bool
   should_defer_layout() const
-  { return !this->objects_.empty() && !this->in_replacement_phase_; }
+  { return this->any_claimed_ && !this->in_replacement_phase_; }
 
   // Add a regular object to the deferred layout list.  These are
   // objects whose layout has been deferred until after the
@@ -393,7 +393,9 @@ class Pluginobj : public Object
 
   // Fill in the symbol resolution status for the given plugin symbols.
   ld_plugin_status
-  get_symbol_resolution_info(int nsyms, ld_plugin_symbol* syms) const;
+  get_symbol_resolution_info(int nsyms,
+                            ld_plugin_symbol* syms,
+                            int version) const;
 
   // Store the incoming symbols from the plugin for later processing.
   void
@@ -431,7 +433,7 @@ class Pluginobj : public Object
 
   // The number of symbols provided by the plugin.
   int nsyms_;
-  
+
   // The symbols provided by the plugin.
   const struct ld_plugin_symbol* syms_;
 
@@ -491,8 +493,9 @@ class Sized_pluginobj : public Pluginobj
   do_section_name(unsigned int shndx);
 
   // Return a view of the contents of a section.
-  Object::Location
-  do_section_contents(unsigned int shndx);
+  const unsigned char*
+  do_section_contents(unsigned int shndx, section_size_type* plen,
+                     bool cache);
 
   // Return section flags.
   uint64_t
@@ -551,11 +554,11 @@ class Plugin_hook : public Task
 {
  public:
   Plugin_hook(const General_options& options, Input_objects* input_objects,
-             Symbol_table* symtab, Layout* layout, Dirsearch* dirpath,
+             Symbol_table* symtab, Layout* /*layout*/, Dirsearch* dirpath,
              Mapfile* mapfile, Task_token* this_blocker,
              Task_token* next_blocker)
     : options_(options), input_objects_(input_objects), symtab_(symtab),
-      layout_(layout), dirpath_(dirpath), mapfile_(mapfile),
+      dirpath_(dirpath), mapfile_(mapfile),
       this_blocker_(this_blocker), next_blocker_(next_blocker)
   { }
 
@@ -580,7 +583,6 @@ class Plugin_hook : public Task
   const General_options& options_;
   Input_objects* input_objects_;
   Symbol_table* symtab_;
-  Layout* layout_;
   Dirsearch* dirpath_;
   Mapfile* mapfile_;
   Task_token* this_blocker_;