From c2fa9cedff58bfdb38cfb627b58fb34256f20369 Mon Sep 17 00:00:00 2001 From: Vladimir Radosavljevic Date: Thu, 17 Mar 2016 13:28:34 -0700 Subject: [PATCH] Fix problem with --emit-relocs for Mips-32. gold/ * mips.cc (Mips_classify_reloc::put_r_info): Call 32bit version of elf_r_info. --- gold/ChangeLog | 5 +++++ gold/mips.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index d2b64338436..1957df90c01 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2016-03-17 Vladimir Radosavljevic + + * mips.cc (Mips_classify_reloc::put_r_info): Call 32bit version of + elf_r_info. + 2016-03-09 H.J. Lu * testsuite/plugin_layout_with_alignment.cc: Renamed to .. diff --git a/gold/mips.cc b/gold/mips.cc index 6f66fe9f45e..895fd4c00fe 100644 --- a/gold/mips.cc +++ b/gold/mips.cc @@ -2976,7 +2976,7 @@ class Mips_classify_reloc : 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. -- 2.30.2