Use relative relocation for R_X86_64_32 on x32

2013-09-03  Pavel Chupin  <pavel.v.chupin@intel.com>

	PR gold/15927
	* x86_64.cc (Target_x86_64<size>::Scan::global): Use relative
	relocation for R_X86_64_32 on x32.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index df61e9ccbd6488e2ab7d928f02b926c3dc87512d..ed8105d0229fa1304e2dde8f1c9948c56fdfd7a4 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-03  Pavel Chupin  <pavel.v.chupin@intel.com>
+
+       PR gold/15927
+       * x86_64.cc (Target_x86_64<size>::Scan::global): Use relative
+       relocation for R_X86_64_32 on x32.
+
 2013-08-27  Roland McGrath  <mcgrathr@google.com>
 
        * output.cc (Output_segment::set_section_addresses): Take new

diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index dca6022271530b67722b3f166d83b27471f6ac97..5bf78fdef7fb40264b56dd295bec1f8652df8941 100644 (file)
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -2742,7 +2742,8 @@ Target_x86_64<size>::Scan::global(Symbol_table* symtab,
                                                       reloc.get_r_offset(),
                                                       reloc.get_r_addend());
              }
-           else if (r_type == elfcpp::R_X86_64_64
+           else if (((size == 64 && r_type == elfcpp::R_X86_64_64)
+                     || (size == 32 && r_type == elfcpp::R_X86_64_32))
                     && gsym->can_use_relative_reloc(false))
              {
                Reloc_section* rela_dyn = target->rela_dyn_section(layout);