2011-02-28 Michael Snyder <msnyder@vmware.com>

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

diff --git a/gold/output.h b/gold/output.h
index 40d8d3fe98dd3ef7e454ef46de7de6289b0a2b59..0d88294fde9803ecd9eb7d23f24df3adf6bf6a28 100644 (file)
--- a/gold/output.h
+++ b/gold/output.h
@@ -1789,13 +1789,13 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
   void
   add_output_section(Output_section* os, unsigned int type, Output_data* od,
                     Address address, Addend addend)
-  { this->add(os, Output_reloc_type(os, type, od, address, addend)); }
+  { this->add(od, Output_reloc_type(os, type, od, address, addend)); }
 
   void
-  add_output_section(Output_section* os, unsigned int type,
+  add_output_section(Output_section* os, unsigned int type, Output_data* od,
                      Sized_relobj<size, big_endian>* relobj,
                     unsigned int shndx, Address address, Addend addend)
-  { this->add(os, Output_reloc_type(os, type, relobj, shndx, address,
+  { this->add(od, Output_reloc_type(os, type, relobj, shndx, address,
                                     addend)); }
 
   // Add an absolute relocation.
@@ -2542,9 +2542,12 @@ class Output_section : public Output_data
   void
   add_output_section_data(Output_section_data* posd);
 
-  // Add a relaxed input section PORIS to this output section.
+  // Add a relaxed input section PORIS called NAME to this output section
+  // with LAYOUT.
   void
-  add_relaxed_input_section(Output_relaxed_input_section* poris);
+  add_relaxed_input_section(Layout* layout,
+                           Output_relaxed_input_section* poris,
+                           const std::string& name);
 
   // Return the section name.
   const char*
@@ -3908,8 +3911,8 @@ class Output_segment
   // *PSHNDX.  This should only be called for a PT_LOAD segment.
   uint64_t
   set_section_addresses(const Layout*, bool reset, uint64_t addr,
-                       unsigned int increase_relro, off_t* poff,
-                       unsigned int* pshndx);
+                       unsigned int* increase_relro, bool* has_relro,
+                       off_t* poff, unsigned int* pshndx);
 
   // Set the minimum alignment of this segment.  This may be adjusted
   // upward based on the section alignments.