summaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog11
-rw-r--r--gold/i386.cc6
2 files changed, 17 insertions, 0 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index a3d0571dcdb..c0af0291d0e 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,14 @@
+2015-10-22 H.J. Lu <hongjiu.lu@intel.com>
+
+ * i386.cc (Target_i386::Scan::get_reference_flags(): Treat
+ R_386_GOT32X the same as R_386_GOT32.
+ (Target_i386::Scan::local): Likewise.
+ (Target_i386::Scan::possible_function_pointer_reloc): Likewise.
+ (Target_i386::Scan::global): Likewise.
+ (Target_i386::Relocate::relocate): Likewise.
+ (Target_i386::Relocatable_size_for_reloc::get_size_for_reloc):
+ Likewise.
+
2015-10-20 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/Makefile.am (x86_64_mov_to_lea11): Replace
diff --git a/gold/i386.cc b/gold/i386.cc
index 202f518c356..36c57241ef9 100644
--- a/gold/i386.cc
+++ b/gold/i386.cc
@@ -1690,6 +1690,7 @@ Target_i386::Scan::get_reference_flags(unsigned int r_type)
return Symbol::FUNCTION_CALL | Symbol::RELATIVE_REF;
case elfcpp::R_386_GOT32:
+ case elfcpp::R_386_GOT32X:
// Absolute in GOT.
return Symbol::ABSOLUTE_REF;
@@ -1854,6 +1855,7 @@ Target_i386::Scan::local(Symbol_table* symtab,
break;
case elfcpp::R_386_GOT32:
+ case elfcpp::R_386_GOT32X:
{
// We need GOT section.
Output_data_got<32, false>* got = target->got_section(symtab, layout);
@@ -2105,6 +2107,7 @@ Target_i386::Scan::possible_function_pointer_reloc(unsigned int r_type)
case elfcpp::R_386_8:
case elfcpp::R_386_GOTOFF:
case elfcpp::R_386_GOT32:
+ case elfcpp::R_386_GOT32X:
{
return true;
}
@@ -2266,6 +2269,7 @@ Target_i386::Scan::global(Symbol_table* symtab,
break;
case elfcpp::R_386_GOT32:
+ case elfcpp::R_386_GOT32X:
{
// The symbol requires a GOT section.
Output_data_got<32, false>* got = target->got_section(symtab, layout);
@@ -2834,6 +2838,7 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo,
break;
case elfcpp::R_386_GOT32:
+ case elfcpp::R_386_GOT32X:
// Convert
// mov foo@GOT(%reg), %reg
// to
@@ -3617,6 +3622,7 @@ Target_i386::Relocatable_size_for_reloc::get_size_for_reloc(
case elfcpp::R_386_32:
case elfcpp::R_386_PC32:
case elfcpp::R_386_GOT32:
+ case elfcpp::R_386_GOT32X:
case elfcpp::R_386_PLT32:
case elfcpp::R_386_GOTOFF:
case elfcpp::R_386_GOTPC: