From: Ian Lance Taylor <ian@airs.com>
Date: Thu, 23 Dec 2010 23:26:40 +0000 (+0000)
Subject: 	* output.h (Output_data_reloc::add_output_section): Pass OD instead
X-Git-Tag: binutils-2_21_1~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0181c5b08bb0d02c21044b388373d4c403a2bbf1;p=thirdparty%2Fbinutils-gdb.git

	* output.h (Output_data_reloc::add_output_section): Pass OD instead
	of OS to this->add.  Add OD parameter to second form of the function.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 3f40a9826a8..65c055b13c4 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-23  Cary Coutant  <ccoutant@google.com>
+
+	* output.h (Output_data_reloc::add_output_section): Pass OD instead
+	of OS to this->add.  Add OD parameter to second form of the function.
+
 2010-12-21  Alan Modra  <amodra@gmail.com>
 
 	* po/ja.po: New translation.
diff --git a/gold/output.h b/gold/output.h
index 9ccc21a6760..0d88294fde9 100644
--- 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.