Fix problem with --emit-relocs for Mips-32.

gold/
	* mips.cc (Mips_classify_reloc::put_r_info): Call 32bit version of
	elf_r_info.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index d2b643384360b8f6e22642e9a7c661addb95af76..1957df90c012a1204f31f5089472ed7aad4264fc 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-17  Vladimir Radosavljevic  <vladimir.radosavljevic@imgtec.com>
+
+       * mips.cc (Mips_classify_reloc::put_r_info): Call 32bit version of
+       elf_r_info.
+
 2016-03-09  H.J. Lu  <hongjiu.lu@intel.com>
 
        * testsuite/plugin_layout_with_alignment.cc: Renamed to ..

diff --git a/gold/mips.cc b/gold/mips.cc
index 6f66fe9f45ee0f94aace5f25cd6276712907f3f6..895fd4c00feb9a4f96f07e1c028f58309dabbbc0 100644 (file)
--- a/gold/mips.cc
+++ b/gold/mips.cc
@@ -2976,7 +2976,7 @@ class Mips_classify_reloc<sh_type_, 32, big_endian> :
   put_r_info(Reltype_write* new_reloc, Reltype* reloc, unsigned int r_sym)
   {
     unsigned int r_type = elfcpp::elf_r_type<32>(reloc->get_r_info());
-    new_reloc->put_r_info(elfcpp::elf_r_info<64>(r_sym, r_type));
+    new_reloc->put_r_info(elfcpp::elf_r_info<32>(r_sym, r_type));
   }
 
   // Write the r_addend field to a new reloc.